From d8dad05fbb9b16af94c38669e39388f3a9e823e9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Jul 2013 00:27:34 +0200 Subject: [PATCH] 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" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/uclibc/Config.in | 5 ----- package/uclibc/uclibc.mk | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index b9917a76f5..8d16e8c2f5 100644 --- 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 421e323035..8eca5feee8 100644 --- 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)