diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 11:08:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 11:08:49 +0100 |
| commit | be9bc1c473af631de6427aa3d71afb874445be0c (patch) | |
| tree | 6f33f0d3337bbac1e58c5154beb3904eff83f84c /target/config | |
| parent | 16e4aedad0bc7a26259f194750db8baeaa23af54 (diff) | |
| parent | dd26294176a557e1deaca4666efa99ff4468be34 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 18 |
1 files changed, 3 insertions, 15 deletions
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 |