diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-07-17 16:42:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-07-17 16:42:53 +0200 |
| commit | 82c74501a47638606b8ee4e73e2083bec984c676 (patch) | |
| tree | dad0461d5eccdf1b36f4ffe61929a167dbe773dc /target | |
| parent | 21cf01de199d2152e3f473d8f2c32f5de33d06bd (diff) | |
qemu-arm: use dtb for versatile emulation, required for 4.6.x
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 6 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 515dbf90f..72e60c772 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -30,7 +30,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) -QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 +QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb @@ -146,6 +146,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_VERSATILEPB),y) + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ + dtbs $(MAKE_TRACE) +endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index b9fdc07b6..185b54b68 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,15 +1,6 @@ CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_VERSATILE=y -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_PLAT_VERSATILE_CLOCK=y -CONFIG_PLAT_VERSATILE_CLCD=y -CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y -CONFIG_PLAT_VERSATILE=y -CONFIG_ARM_TIMER_SP804=y +CONFIG_PCI_VERSATILE=y CONFIG_KUSER_HELPERS=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y -CONFIG_ARM_AMBA=y -CONFIG_USE_OF=y CONFIG_ATAGS=y |