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

7 files changed, 9 insertions, 8 deletions

diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index 576468bbe..b907d39c8 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -2,13 +2,14 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	bool "Foxboard FOXG20"
 	select ADK_arm
 	select ADK_little
+	select ADK_soft_float
+	select ADK_eabi
 	select ADK_acmesystems_foxg20
 	select ADK_KERNEL_ARCH_AT91
 	select ADK_KERNEL_ARCH_AT91SAM9260
 	select ADK_KERNEL_ARCH_AT91SAM9G20
 	select ADK_KERNEL_MACH_ACMENETUSFOXG20
 	select ADK_KERNEL_AEABI
-	select ADK_EABI
 	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 f7a4f59bc..3ee6bb8cd 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_arm
 	select ADK_little
 	select ADK_hard_float
+	select ADK_eabihf
 	select ADK_cubox_i
 	select ADK_CPU_CORTEX_A9
-	select ADK_EABIHF
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000
index 36434269c..1610d4b42 100644
--- a/target/arm/sys-available/keyasic-ka2000
+++ b/target/arm/sys-available/keyasic-ka2000
@@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000
 	select ADK_arm
 	select ADK_little
 	select ADK_soft_float
+	select ADK_eabi
 	select ADK_keyasic_ka2000
-	select ADK_EABI
 	select ADK_CPU_ARM926EJ_S
 	select ADK_TOOLCHAIN
 	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index ecf224a1a..3c0f2ad30 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_arm
 	select ADK_little
 	select ADK_hard_float
+	select ADK_eabihf
 	select ADK_raspberry_pi
 	select ADK_CPU_ARM1176JZF_S
-	select ADK_EABIHF
 	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 0f124719d..a58401cf3 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/sys-available/sharp-zaurus
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_arm
 	select ADK_sharp_zaurus
 	select ADK_little
-	select ADK_EABI
+	select ADK_eabi
 	select ADK_CPU_XSCALE
 	select ADK_TARGET_CPU_WITH_IWMMXT
 	select ADK_TARGET_WITH_VGA
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 2cbe76a2e..c6bb00b43 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -4,8 +4,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_toolchain_arm
 	select ADK_little
 	select ADK_soft_float
+	select ADK_eabi
 	select ADK_TOOLCHAIN
-	select ADK_EABI
 	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (soft float).
diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf
index 0517118c3..89383f44f 100644
--- a/target/arm/sys-available/toolchain-armhf
+++ b/target/arm/sys-available/toolchain-armhf
@@ -1,11 +1,11 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF
 	bool "Toolchain only (hard float)"
 	select ADK_arm
-	select ADK_toolchain_armhf
 	select ADK_little
 	select ADK_hard_float
+	select ADK_eabihf
+	select ADK_toolchain_armhf
 	select ADK_TOOLCHAIN
-	select ADK_EABIHF
 	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (hard float).