diff options
| -rw-r--r-- | target/arm/sys-available/acmesystems-foxg20 | 3 | ||||
| -rw-r--r-- | target/arm/sys-available/cubox-i | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/keyasic-ka2000 | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/sharp-zaurus | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/toolchain-arm | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/toolchain-armhf | 4 | ||||
| -rw-r--r-- | target/config/Config.in | 34 |
8 files changed, 26 insertions, 25 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). diff --git a/target/config/Config.in b/target/config/Config.in index 44ee685fe..1eda1e3a4 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -117,14 +117,20 @@ config ADK_n32 config ADK_n64 boolean +config ADK_eabi + boolean + +config ADK_eabihf + boolean + config ADK_TARGET_ABI string default "n32" if ADK_n32 default "n64" if ADK_n64 default "32" if ADK_32 default "x32" if ADK_x32 - default "eabi" if ADK_EABI - default "eabihf" if ADK_EABIHF + default "eabi" if ADK_eabi + default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS @@ -251,19 +257,19 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_ARM926EJ_S config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 boolean "ARM Ltd. Versatile Express for Cortex-A9" select ADK_hard_float - select ADK_EABIHF + select ADK_eabihf select ADK_CPU_CORTEX_A9 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_WITH_VGA @@ -387,12 +393,6 @@ config ADK_TARGET_KERNEL_MAY_64BIT config ADK_TOOLCHAIN_ONLY boolean -config ADK_EABI - boolean - -config ADK_EABIHF - boolean - config ADK_LINUX_64 boolean @@ -700,24 +700,24 @@ endchoice config ADK_TARGET_SUFFIX string - default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF - default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI + default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf + default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF - default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI + default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf + default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "uclibc" if ADK_TARGET_LIB_UCLIBC - default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF - default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI + default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf + default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64 default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64 default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64 |