diff options
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 4 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 72e60c772..ad6e1d9ae 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -30,7 +30,11 @@ 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) +ifeq ($(ADK_TARGET_WITH_DEVICETREE),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb +else +QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 +endif 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 diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 185b54b68..43e9620df 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,6 +1,6 @@ CONFIG_ARM=y -# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_VERSATILE=y CONFIG_PCI_VERSATILE=y CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y +CONFIG_USE_OF=y |