diff options
| -rw-r--r-- | Config.in | 1 | ||||
| -rw-r--r-- | target/config/Config.in.cris | 5 | ||||
| -rw-r--r-- | target/config/Config.in.cris.choice | 16 | ||||
| -rw-r--r-- | target/config/Config.in.cris.default | 13 | ||||
| -rw-r--r-- | target/linux/patches/3.16.2/cris-header.patch | 14 |
5 files changed, 45 insertions, 4 deletions
@@ -20,6 +20,7 @@ source "target/config/Config.in.system" source "target/config/Config.in.endian" source "target/config/Config.in.abi" source "target/config/Config.in.arm" +source "target/config/Config.in.cris" source "target/config/Config.in.x86" source "target/config/Config.in.qemu" source "target/config/Config.in.qemuopts" 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 diff --git a/target/linux/patches/3.16.2/cris-header.patch b/target/linux/patches/3.16.2/cris-header.patch index 9eed4630d..3db07e530 100644 --- a/target/linux/patches/3.16.2/cris-header.patch +++ b/target/linux/patches/3.16.2/cris-header.patch @@ -1,12 +1,18 @@ +diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild +--- linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild 2014-09-26 19:24:50.000000000 +0200 +@@ -1 +1,2 @@ + # CRISv10 arch ++header-y += ptrace.h diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild --- linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200 -+++ linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild 2014-09-26 10:30:42.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild 2014-09-26 19:24:31.000000000 +0200 @@ -1 +1,2 @@ # CRISv32 arch +header-y += ptrace.h diff -Nur linux-3.16.2.orig/arch/cris/include/asm/Kbuild linux-3.16.2/arch/cris/include/asm/Kbuild --- linux-3.16.2.orig/arch/cris/include/asm/Kbuild 2014-09-06 01:37:11.000000000 +0200 -+++ linux-3.16.2/arch/cris/include/asm/Kbuild 2014-09-26 10:29:56.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/asm/Kbuild 2014-09-26 19:24:31.000000000 +0200 @@ -1,8 +1,3 @@ - -header-y += arch-v10/ @@ -18,7 +24,7 @@ diff -Nur linux-3.16.2.orig/arch/cris/include/asm/Kbuild linux-3.16.2/arch/cris/ generic-y += cputime.h diff -Nur linux-3.16.2.orig/arch/cris/include/uapi/asm/Kbuild linux-3.16.2/arch/cris/include/uapi/asm/Kbuild --- linux-3.16.2.orig/arch/cris/include/uapi/asm/Kbuild 2014-09-06 01:37:11.000000000 +0200 -+++ linux-3.16.2/arch/cris/include/uapi/asm/Kbuild 2014-09-26 10:29:56.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/uapi/asm/Kbuild 2014-09-26 19:24:31.000000000 +0200 @@ -1,8 +1,8 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm @@ -32,7 +38,7 @@ diff -Nur linux-3.16.2.orig/arch/cris/include/uapi/asm/Kbuild linux-3.16.2/arch/ header-y += byteorder.h diff -Nur linux-3.16.2.orig/scripts/headers.sh linux-3.16.2/scripts/headers.sh --- linux-3.16.2.orig/scripts/headers.sh 2014-09-06 01:37:11.000000000 +0200 -+++ linux-3.16.2/scripts/headers.sh 2014-09-26 10:29:56.000000000 +0200 ++++ linux-3.16.2/scripts/headers.sh 2014-09-26 19:24:31.000000000 +0200 @@ -19,8 +19,6 @@ case ${arch} in um) # no userspace export |