Merge branch 'master' of git+ssh://openadk.org/git/openadk

11 files changed, 22 insertions, 18 deletions

diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index 29a82ccf6..ec76019d4 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -7,6 +7,7 @@ CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
+CONFIG_KUSER_HELPERS=y
 CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
 CONFIG_ARM_AMBA=y
diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9
index 7415e31b4..b89b87337 100644
--- a/target/arm/kernel/qemu-arm-vexpress-a9
+++ b/target/arm/kernel/qemu-arm-vexpress-a9
@@ -6,6 +6,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
 CONFIG_ARCH_VEXPRESS_TC2_PM=y
+CONFIG_KUSER_HELPERS=y
 CONFIG_ARM_AMBA=y
 CONFIG_AEABI=y
 CONFIG_ATAGS=y
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index aeaa41d44..1fa057c4b 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_qemu_arm
 	select ADK_little
 	select ADK_soft_float
-	select ADK_fpu_vfp
 	select ADK_eabi
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/config/Config.in b/target/config/Config.in
index 4586de17b..794cc934f 100644
--- a/target/config/Config.in
+++ b/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-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	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 || 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
diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips
index 98aaf8a02..d3ea99011 100644
--- a/target/mips/sys-available/qemu-mips
+++ b/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.
 
diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64
index 10da0835c..ce9c5b0fa 100644
--- a/target/mips/sys-available/qemu-mips64
+++ b/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.
 
diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el
index 82bb7fbf2..067d0d6ed 100644
--- a/target/mips/sys-available/qemu-mips64el
+++ b/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.
diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel
index 7163ae120..688471d6d 100644
--- a/target/mips/sys-available/qemu-mipsel
+++ b/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.
 
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips
index 9e93cfdcd..55a2e9e7d 100644
--- a/target/mips/sys-available/toolchain-mips
+++ b/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.
 
diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel
index 4c197b808..e850d7116 100644
--- a/target/mips/sys-available/toolchain-mipsel
+++ b/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.
 
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64
index 48b6fceab..5067a8ecf 100644
--- a/target/x86_64/sys-available/qemu-x86_64
+++ b/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