Browse Source

x86-64 32bit needs more work, fix armhf

Waldemar Brodkorb 10 years ago
parent
commit
22855e8ea8
3 changed files with 4 additions and 15 deletions
  1. 2 2
      mk/build.mk
  2. 2 1
      target/config/Config.in
  3. 0 12
      target/x86_64/sys-available/qemu-x86_64_32

+ 2 - 2
mk/build.mk

@@ -504,7 +504,7 @@ test-framework:
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
 			for arch in $$(grep -v m68k target/tarch.lst|xargs);do \
-				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \
+				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \
 				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
@@ -512,7 +512,7 @@ test-framework:
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
-				if [ $$arch = "armhf" ];then qarch=arm; else qarch=$$arch;fi; \
+				qarch=$$(echo $$arch|sed -e "s#armhf#arm#" -e 's#mips64n.*$$#mips64#' -e 's#mips64eln.*$$#mips64el#'); \
 				cp -a root_qemu_$${qarch}_$${libc}$${abi} root; \
 				mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \
 				tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \

+ 2 - 1
target/config/Config.in

@@ -662,7 +662,8 @@ config ADK_TARGET_LIB_UCLIBC
 		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
-		   !ADK_TARGET_ABI_X32
+		   !ADK_x32 && \
+		   !ADK_32
 	help
  	 http://uclibc.org
 

+ 0 - 12
target/x86_64/sys-available/qemu-x86_64_32

@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_X86_64_32
-	bool "Qemu Emulator (x86_64 with 32 ABI)"
-	select ADK_x86_64
-	select ADK_qemu_x86_64
-	select ADK_32
-	select ADK_CPU_X86_64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_BZIMAGE
-	help
-	 Support for Qemu Emulator.
-