From 530e074f9709804b784304c21733b567c7dffbc8 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 30 Oct 2014 16:57:28 +0300 Subject: [PATCH] uclibc: add explicit setup of ARC-specific options As with other architectures for ARC we need to have an ability to set specific options in uClibc. In particular this is required for selection of ARC ISA version. [Peter: string type, so must be in quotes as noted by Yann] Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Anton Kolesov Signed-off-by: Peter Korsgaard --- package/uclibc/Config.in | 6 ++++++ package/uclibc/uclibc.mk | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index d319ae7841..0aaefa33fc 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -194,6 +194,12 @@ config BR2_UCLIBC_TARGET_ARCH default i386 if BR2_i386 default x86_64 if BR2_x86_64 +config BR2_UCLIBC_ARC_TYPE + string + depends on BR2_UCLIBC_TARGET_ARCH = "arc" + default "ARC_CPU_700" if BR2_arc750d + default "ARC_CPU_700" if BR2_arc770d + 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 b2ecce397b..8f990c7b87 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -56,6 +56,17 @@ UCLIBC_LOCALES = $(foreach locale,$(GENERATE_LOCALE),\ $(firstword $(subst .,$(space),$(locale)))) endif +# +# ARC definitions +# + +ifeq ($(UCLIBC_TARGET_ARCH),arc) +UCLIBC_ARC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_ARC_TYPE)) +define UCLIBC_ARC_TYPE_CONFIG + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_TYPE),$(@D)/.config) +endef +endif # arc + # # ARM definitions # @@ -410,6 +421,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config) $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config) $(UCLIBC_MMU_CONFIG) + $(UCLIBC_ARC_TYPE_CONFIG) $(UCLIBC_ARM_ABI_CONFIG) $(UCLIBC_ARM_BX_CONFIG) $(UCLIBC_MIPS_ABI_CONFIG) -- 2.30.2