summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/arm/sys-available/qemu-arm2
-rw-r--r--target/arm/sys-available/qemu-armhf2
-rw-r--r--target/config/Config.in18
3 files changed, 7 insertions, 15 deletions
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index eec8410ff..1fa057c4b 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,6 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
select ADK_arm
select ADK_qemu_arm
select ADK_little
+ select ADK_soft_float
+ select ADK_eabi
select ADK_HARDWARE_QEMU
select ADK_TARGET_KERNEL_ZIMAGE
help
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
index 07059a8f3..798391b8c 100644
--- a/target/arm/sys-available/qemu-armhf
+++ b/target/arm/sys-available/qemu-armhf
@@ -3,6 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARMHF
select ADK_arm
select ADK_qemu_arm
select ADK_little
+ select ADK_hard_float
+ select ADK_eabihf
select ADK_HARDWARE_QEMU
select ADK_TARGET_KERNEL_ZIMAGE
help
diff --git a/target/config/Config.in b/target/config/Config.in
index a8b69fb90..a917f6a3c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -279,25 +279,11 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
endchoice
choice
-prompt "Qemu ARM Emulation (hard-float)"
-depends on ADK_TARGET_SYSTEM_QEMU_ARMHF
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
- boolean "ARM Ltd. Versatile Express for Cortex-A9"
- select ADK_hard_float
- select ADK_eabihf
- select ADK_CPU_CORTEX_A9
-
-endchoice
-
-choice
prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM
+depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF
config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
boolean "ARM Ltd. Versatile Express for Cortex-A9"
- select ADK_soft_float
- select ADK_eabi
select ADK_CPU_CORTEX_A9
config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
@@ -305,6 +291,7 @@ config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
select ADK_soft_float
select ADK_eabi
select ADK_CPU_ARM926EJ_S
+ depends on ADK_TARGET_SYSTEM_QEMU_ARM
config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
boolean "Xscale PXA270 Spitz PDA"
@@ -312,6 +299,7 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
select ADK_eabi
select ADK_CPU_XSCALE
select ADK_TARGET_WITH_VGA
+ depends on ADK_TARGET_SYSTEM_QEMU_ARM
endchoice