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

8 files changed, 7 insertions, 16 deletions

diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index 527a31ebb..576468bbe 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -9,7 +9,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_KERNEL_MACH_ACMENETUSFOXG20
 	select ADK_KERNEL_AEABI
 	select ADK_EABI
-	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_RTC
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 28b918708..f7a4f59bc 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -2,8 +2,9 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	bool "Cubox-i"
 	select ADK_arm
 	select ADK_little
+	select ADK_hard_float
 	select ADK_cubox_i
-	select ADK_CPU_CUBOX_I
+	select ADK_CPU_CORTEX_A9
 	select ADK_EABIHF
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000
index cc193e2ef..3c9573ebe 100644
--- a/target/arm/sys-available/keyasic-ka2000
+++ b/target/arm/sys-available/keyasic-ka2000
@@ -2,11 +2,10 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000
 	bool "KeyASIC KA2000 (f.e. Transcend WifiSD)"
 	select ADK_arm
 	select ADK_little
+	select ADK_soft_float
 	select ADK_keyasic_ka2000
-	select ADK_KERNEL_AEABI
 	select ADK_EABI
-	select ADK_CPU_ARMV5
-	select ADK_TARGET_NO_FPU
+	select ADK_CPU_ARM926EJ_S
 	select ADK_TOOLCHAIN
 	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
 	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 4247b8862..4b99f7f0e 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,8 +3,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_arm
 	select ADK_qemu_arm
 	select ADK_little
-	select ADK_EABI
-	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_USE_KERNEL_MINICONFIG
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 36d96b064..ecf224a1a 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -2,9 +2,10 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
 	select ADK_arm
 	select ADK_little
+	select ADK_hard_float
 	select ADK_raspberry_pi
+	select ADK_CPU_ARM1176JZF_S
 	select ADK_EABIHF
-	select ADK_CPU_RASPBERRY_PI
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
index 848dfdbd1..0f124719d 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/sys-available/sharp-zaurus
@@ -6,17 +6,12 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_EABI
 	select ADK_CPU_XSCALE
 	select ADK_TARGET_CPU_WITH_IWMMXT
-	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_PCMCIA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_TOUCHSCREEN
-	select ADK_KERNEL_ARCH_PXA
-	select ADK_KERNEL_PXA_SHARPSL
-	select ADK_KERNEL_MACH_SPITZ
-	select ADK_KERNEL_PXA_SHARP_Cxx00
-	select ADK_KERNEL_SPI_PXA2XX
 	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 956acab7a..8ac2da8b6 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_little
 	select ADK_TOOLCHAIN
 	select ADK_EABI
-	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (little endian).
diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb
index 4756e0db2..ad9d2117a 100644
--- a/target/arm/sys-available/toolchain-armeb
+++ b/target/arm/sys-available/toolchain-armeb
@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB
 	select ADK_big
 	select ADK_TOOLCHAIN
 	select ADK_EABI
-	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (big endian).