diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-01 17:45:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-01 17:45:44 +0100 |
| commit | 097326f9428371814d1a04d1858be027bb03f206 (patch) | |
| tree | 4d21bf9ff546361cad8448b14ce513e8905ef92c | |
| parent | a58be2e9339a5241e89f5192969ce01e99c8a0f7 (diff) | |
arm: use latest kernel for qemu armv6 emulation
| -rw-r--r-- | target/arm/Makefile | 6 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-realview-eb-mpcore | 3 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 3be194688..44eedd2cc 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -30,7 +30,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y) QEMU_ARGS+=-M terrier endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) -QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic +QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb @@ -172,6 +172,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ + arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) +endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ versatile-pb.dtb $(MAKE_TRACE) diff --git a/target/arm/kernel/qemu-arm-realview-eb-mpcore b/target/arm/kernel/qemu-arm-realview-eb-mpcore index 2debaedff..9f967f4f2 100644 --- a/target/arm/kernel/qemu-arm-realview-eb-mpcore +++ b/target/arm/kernel/qemu-arm-realview-eb-mpcore @@ -1,4 +1,7 @@ CONFIG_ARM=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_REALVIEW=y CONFIG_MACH_REALVIEW_EB=y CONFIG_REALVIEW_EB_ARM11MP=y diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index c2af39396..d1f8cbe1b 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -15,7 +15,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG -default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default ADK_TARGET_LINUX_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV32 default ADK_TARGET_LINUX_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV64 default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 @@ -37,7 +36,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_15 depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 bool "4.14.30" @@ -48,7 +46,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 bool "4.9.88" @@ -59,7 +56,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 depends on !ADK_TARGET_ARCH_OR1K depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 config ADK_TARGET_LINUX_KERNEL_VERSION_4_4 |