test framework fixes

mk/build.mk

@@ -503,8 +503,9 @@ test-framework:
 	for libc in $$libc;do \
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
-			for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
+			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##"); \
+				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \

mk/kernel-build.mk

@@ -54,6 +54,7 @@ $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-create-packages
+	@mkdir -p ${PACKAGE_DIR}
 ifneq ($(strip $(TARGETS)),)
 	$(MAKE) $(TARGETS)
 endif

target/config/Config.in

@@ -139,7 +139,7 @@ config ADK_TARGET_MIPS_ABI
 
 choice
 prompt "Target ABI"
-depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN
+depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU
 
 config ADK_TARGET_ABI_N32
 	boolean "N32 ABI (new)"
@@ -157,7 +157,7 @@ endchoice
 
 choice
 prompt "Target ABI"
-depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN
+depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU
 
 config ADK_TARGET_ABI_64
 	boolean "64 Bit ABI"
@@ -194,8 +194,8 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default "qemu-mipsel" if ADK_TARGET_SYSTEM_QEMU_MIPSEL
-	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_MIPS64N32 || ADK_TARGET_SYSTEM_QEMU_MIPS64N64
-	default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN32 || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN64
 	default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC
 	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4
@@ -203,7 +203,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
 	default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
-	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
 	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I

target/mips/sys-available/qemu-mips

@@ -1,10 +1,10 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS
-	bool "Qemu Emulator (big endian)"
+	bool "Qemu Emulator (mips32 big endian)"
 	select ADK_mips
 	select ADK_big
 	select ADK_qemu_mips
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for mips big endian architecture.
+	 Qemu support for mips32 big endian architecture.
 

target/mips/sys-available/qemu-mips64

@@ -1,12 +1,13 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS64
-	bool "Qemu Emulator (mips64 big endian)"
+	bool "Qemu Emulator (mips64 big endian o32 abi)"
 	select ADK_mips
 	select ADK_big
+	select ADK_o32
 	select ADK_qemu_mips64
 	select ADK_CPU_MIPS64
 	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for mips64 big endian architecture.
+	 Qemu support for mips64 big endian architecture with o32 abi.
 

target/mips/sys-available/qemu-mips64el

@@ -1,11 +1,12 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
-	bool "Qemu Emulator (mips64 little endian)"
+	bool "Qemu Emulator (mips64 little endian o32 abi)"
 	select ADK_mips
 	select ADK_little
+	select ADK_o32
 	select ADK_qemu_mips64el
 	select ADK_CPU_MIPS64
 	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for mips64 little endian architecture.
+	 Qemu support for mips64 little endian architecture with o32 abi.

target/mips/sys-available/qemu-mipsel

@@ -1,10 +1,10 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPSEL
-	bool "Qemu Emulator (little endian)"
+	bool "Qemu Emulator (mips32 little endian)"
 	select ADK_mips
 	select ADK_qemu_mipsel
 	select ADK_little
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for mips little endian architecture.
+	 Qemu support for mips32 little endian architecture.
 

target/mips/sys-available/toolchain-mips

@@ -1,10 +1,10 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
-	bool "Toolchain only (big endian)"
+	bool "Toolchain only (mips32 big endian)"
 	select ADK_mips
 	select ADK_big
 	select ADK_toolchain_mips
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS toolchain.
+	  MIPS32 big endian toolchain.
 

target/mips/sys-available/toolchain-mipsel

@@ -1,10 +1,10 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only (mips32 little endian)"
 	select ADK_mips
 	select ADK_little
 	select ADK_toolchain_mipsel
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS toolchain.
+	  MIPS32 little endian toolchain.
 

target/x86_64/sys-available/qemu-x86_64

@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	bool "Qemu Emulator"
 	select ADK_x86_64
 	select ADK_qemu_x86_64
+	select ADK_64
 	select ADK_CPU_X86_64
 	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU