package/uClibc: drop ARM EABI conditions

... since we now only support EABI for ARM, we only need to
force EABI unconditionally.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index b9917a76f5f8fc913cef10702ccf3824dc91cfd6..8d16e8c2f5d1bf91f519c7bf5e14d76ead5e9875 100644 (file)
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -182,11 +182,6 @@ config BR2_UCLIBC_ARM_TYPE
        default ARM_CORTEXA8    if BR2_cortex_a8
        default ARM_CORTEXA9    if BR2_cortex_a9
 
-config BR2_UCLIBC_ARM_ABI
-       string
-       depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-       default EABI if BR2_ARM_EABI
-
 config BR2_UCLIBC_ARM_BX
        bool
        depends on BR2_UCLIBC_TARGET_ARCH = "arm"

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 421e32303507719936df226c2a9de33ca053e8fb..8eca5feee8fddcbfc86fb5652bf4a8f120a27b57 100644 (file)
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -69,11 +69,9 @@ define UCLIBC_ARM_TYPE_CONFIG
        $(call UCLIBC_OPT_SET,$(UCLIBC_ARM_TYPE),y,$(@D))
 endef
 
-UCLIBC_ARM_ABI = CONFIG_ARM_$(call qstrip,$(BR2_UCLIBC_ARM_ABI))
-
 define UCLIBC_ARM_ABI_CONFIG
        $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
-       $(call UCLIBC_OPT_SET,$(UCLIBC_ARM_ABI),y,$(@D))
+       $(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
 endef
 
 ifeq ($(BR2_UCLIBC_ARM_BX),y)