From b71f41a9286d34a9ac3d19a7ffa07208682c27e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 26 Sep 2014 18:24:25 +0200 Subject: add support for toolchain building for crisv32 architecture --- target/config/Config.in.cpu | 8 ++++++++ target/config/Config.in.libc.choice | 2 ++ target/config/Config.in.libc.default | 2 ++ target/config/Config.in.target | 2 ++ target/config/Config.in.toolchain | 12 +++++++++++- 5 files changed, 25 insertions(+), 1 deletion(-) (limited to 'target/config') diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index b39b5a65c..c191d9f37 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -46,6 +46,12 @@ config ADK_CPU_ATHLON config ADK_CPU_ARC boolean +config ADK_CPU_CRIS_V10 + boolean + +config ADK_CPU_CRIS_V32 + boolean + config ADK_CPU_SH4 boolean @@ -131,6 +137,8 @@ config ADK_TARGET_CPU_ARCH default "arceb" if ADK_CPU_ARC && ADK_big default "avr32" if ADK_CPU_AVR32 default "bfin" if ADK_CPU_BFIN + default "cris" if ADK_CPU_CRIS_V10 + default "crisv32" if ADK_CPU_CRIS_V32 default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 0a9f13be6..01391f453 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -42,6 +42,7 @@ config ADK_TARGET_LIB_GLIBC depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_BFIN + depends on !ADK_LINUX_CRIS depends on !ADK_LINUX_XTENSA depends on !ADK_TARGET_UCLINUX help @@ -54,6 +55,7 @@ config ADK_TARGET_LIB_UCLIBC depends on \ !ADK_LINUX_AARCH64 && \ !ADK_LINUX_ALPHA && \ + !ADK_LINUX_CRIS && \ !ADK_LINUX_MICROBLAZE && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 04c6b4204..5f46ea41a 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -32,6 +32,8 @@ config ADK_LIBC_VERSION config ADK_TARGET_WITH_NPTL boolean + default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_CRIS + default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_CRIS default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_M68K default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_M68K default y diff --git a/target/config/Config.in.target b/target/config/Config.in.target index ad1e8dfe0..764a3357b 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -3,6 +3,8 @@ config ADK_TARGET_CFLAGS string + default "-march=v32" if ADK_CPU_CRIS_V32 + default "-march=v10" if ADK_CPU_CRIS_V10 default "-mcpu=5208" if ADK_CPU_CF_5208 default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE default "-m4 -ml" if ADK_CPU_SH4 && ADK_little diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 23b348ecc..0fcdc442b 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -23,6 +23,11 @@ config ADK_TOOLCHAIN_GCC_4_5_4 boolean depends on ADK_LINUX_BFIN +config ADK_TOOLCHAIN_GCC_4_7_4 + prompt "4.7.4" + boolean + depends on ADK_LINUX_CRIS + config ADK_TOOLCHAIN_GCC_4_8_0_ARC prompt "4.8.0-arc" boolean @@ -35,6 +40,7 @@ config ADK_TOOLCHAIN_GCC_4_8_3 depends on !ADK_LINUX_AARCH64 depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 + depends on !ADK_LINUX_CRIS config ADK_TOOLCHAIN_GCC_4_9_1 prompt "4.9.1" @@ -42,6 +48,7 @@ config ADK_TOOLCHAIN_GCC_4_9_1 depends on !ADK_LINUX_BFIN depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 + depends on !ADK_LINUX_CRIS config ADK_TOOLCHAIN_GCC_GIT prompt "git" @@ -50,6 +57,7 @@ config ADK_TOOLCHAIN_GCC_GIT depends on !ADK_LINUX_BFIN depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 + depends on !ADK_LINUX_CRIS endchoice @@ -65,7 +73,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1 config ADK_TOOLCHAIN_BINUTILS_2_22 prompt "2.22" boolean - depends on ADK_LINUX_BFIN + depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS config ADK_TOOLCHAIN_BINUTILS_2_23_ARC prompt "2.23-arc" @@ -78,6 +86,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24 depends on !ADK_LINUX_BFIN depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 + depends on !ADK_LINUX_CRIS config ADK_TOOLCHAIN_BINUTILS_GIT prompt "git" @@ -86,6 +95,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_LINUX_BFIN depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 + depends on !ADK_LINUX_CRIS endchoice -- cgit v1.2.3 From a5e06a0c3562611907f21b7b8bb0c41fbd1e394a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 26 Sep 2014 20:06:19 +0200 Subject: allow to build a cris v10 toolchain --- target/config/Config.in.cris | 5 +++++ target/config/Config.in.cris.choice | 16 ++++++++++++++++ target/config/Config.in.cris.default | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 target/config/Config.in.cris create mode 100644 target/config/Config.in.cris.choice create mode 100644 target/config/Config.in.cris.default (limited to 'target/config') diff --git a/target/config/Config.in.cris b/target/config/Config.in.cris new file mode 100644 index 000000000..3dc12a897 --- /dev/null +++ b/target/config/Config.in.cris @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.cris.choice +source target/config/Config.in.cris.default diff --git a/target/config/Config.in.cris.choice b/target/config/Config.in.cris.choice new file mode 100644 index 000000000..55a6a8997 --- /dev/null +++ b/target/config/Config.in.cris.choice @@ -0,0 +1,16 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice ADK_TARGET_CRIS_CPU_ARCH +prompt "CPU architecture" +depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_CRIS + +config ADK_CPU_CRIS_V10 + boolean "cris v10" + select ADK_crisv10 + +config ADK_CPU_CRIS_V32 + boolean "cris v32" + select ADK_crisv32 + +endchoice diff --git a/target/config/Config.in.cris.default b/target/config/Config.in.cris.default new file mode 100644 index 000000000..a307897a0 --- /dev/null +++ b/target/config/Config.in.cris.default @@ -0,0 +1,13 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_crisv10 + boolean + +config ADK_crisv32 + boolean + +config ADK_TARGET_CRIS_CPU + string + default "cris" if ADK_crisv10 + default "crisv32" if ADK_crisv32 -- cgit v1.2.3