From 097326f9428371814d1a04d1858be027bb03f206 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 1 Apr 2018 17:45:44 +0100 Subject: arm: use latest kernel for qemu armv6 emulation --- target/arm/Makefile | 6 +++++- target/arm/kernel/qemu-arm-realview-eb-mpcore | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'target/arm') 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 -- cgit v1.2.3