Parcourir la source

fix FLOAT selection for Qemu-PPC, add Qemu Model preselection

Waldemar Brodkorb il y a 9 ans
Parent
commit
d4033064d9
3 fichiers modifiés avec 11 ajouts et 4 suppressions
  1. 6 0
      mk/build.mk
  2. 4 4
      target/config/Config.in.float.choice
  3. 1 0
      target/config/Config.in.qemu

+ 6 - 0
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

+ 4 - 4
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"

+ 1 - 0
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"