diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-29 18:05:49 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-05-29 18:05:49 -0500 |
| commit | d4033064d971d0958c289bf5cc34fea8fa4f9f22 (patch) | |
| tree | 32c1a4cdf8de8a93c3f70d7bf96d84392ab8a96b | |
| parent | f12fbcd94871b4b2957a9e71a80963b4fedf9aca (diff) | |
fix FLOAT selection for Qemu-PPC, add Qemu Model preselection
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | target/config/Config.in.float.choice | 8 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index c377c00ff..277db5dcb 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -465,6 +465,12 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(ADK_TARGET_QEMU)" ];then \ + grep "^config" target/config/Config.in.qemu \ + |grep -i "$(ADK_TARGET_QEMU)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(ADK_TOPDIR)/.defconfig; \ + fi @if [ ! -z "$(ADK_APPLIANCE)" ];then \ $(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \ fi diff --git a/target/config/Config.in.float.choice b/target/config/Config.in.float.choice index e22ac65f3..8ce2816ce 100644 --- a/target/config/Config.in.float.choice +++ b/target/config/Config.in.float.choice @@ -1,15 +1,15 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -choice ADK_TARGET_FLOAT +choice ADK_TARGET_FLOAT_MODE prompt "Float configuration" -depends on (ADK_TARGET_ARCH_ARM || \ +depends on ADK_TARGET_ARCH_ARM || \ ADK_TARGET_ARCH_MIPS || \ - ADK_TARGET_ARCH_PPC) && \ - ADK_TARGET_CPU_WITH_FPU + ADK_TARGET_ARCH_PPC config ADK_TARGET_HARD_FLOAT bool "hard-float" + depends on ADK_TARGET_CPU_WITH_FPU config ADK_TARGET_SOFT_FLOAT bool "soft-float" diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index 863353c77..adcf30569 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -8,6 +8,7 @@ depends on ADK_TARGET_SYSTEM_QEMU_PPC config ADK_TARGET_QEMU_PPC_BAMBOO bool "Bamboo PPC" select ADK_CPU_PPC_440 + select ADK_TARGET_SOFT_FLOAT config ADK_TARGET_QEMU_PPC_MACPPC bool "Mac99 PPC" |