Browse Source

add support for ARCv2 ARC HS toolchain compilation

Waldemar Brodkorb 9 years ago
parent
commit
5ffc823114

+ 0 - 1
target/arc/systems/toolchain-arc

@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARC
 	bool "Toolchain only"
-	select ADK_CPU_ARC700
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 2 - 2
target/config/Config.in.cpu

@@ -18,7 +18,7 @@ config ADK_CPU_ARC700
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
-config ADK_CPU_ARCv2EM
+config ADK_CPU_ARC_HS
 	bool
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
@@ -320,7 +320,7 @@ config ADK_TARGET_GCC_CPU
 	default "440" if ADK_CPU_PPC_440
 	default "5208" if ADK_CPU_CF_5208
 	default "arc700" if ADK_CPU_ARC700
-	default "arcv2em" if ADK_CPU_ARCv2EM
+	default "archs" if ADK_CPU_ARC_HS
 	default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S
 	default "arm926ej-s" if ADK_CPU_ARM926EJ_S
 	default "armv8-a" if ADK_CPU_ARMV8

+ 11 - 0
target/config/Config.in.tc

@@ -5,9 +5,20 @@ choice ADK_TARGET_CPU
 prompt "CPU type"
 depends on ADK_TARGET_TOOLCHAIN && \
 	( ADK_TARGET_ARCH_CRIS \
+	|| ADK_TARGET_ARCH_ARC \
 	|| ADK_TARGET_ARCH_ARM \
 	|| ADK_TARGET_ARCH_X86 )
 
+config ADK_TARGET_CPU_ARC_ARC700
+	bool "ARC700 (ARCv1)"
+	select ADK_CPU_ARC700
+	depends on ADK_TARGET_ARCH_ARC
+
+config ADK_TARGET_CPU_ARC_ARC_HS
+	bool "ARC HS (ARCv2)"
+	select ADK_CPU_ARC_HS
+	depends on ADK_TARGET_ARCH_ARC
+
 config ADK_TARGET_CPU_ARM_CORTEX_A9
         bool "cortex-a9"
         select ADK_CPU_CORTEX_A9

+ 12 - 0
toolchain/uclibc-ng/Makefile

@@ -160,6 +160,18 @@ endif
 # architecture specific options
 #
 
+# arc
+ifeq ($(ADK_TARGET_ARCH_ARC),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y)
+	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_TARGET_CPU_ARC_ARC_HS),y)
+	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+endif
+
 # arm
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y)