From 6cebe0b4795fd2d4f3b00b026286fe05c8366e67 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 23 Mar 2015 03:13:16 -0500 Subject: allow to select CPU flavour for toolchain building via env Add a more generic way to define CPU flavours for Toolchain building. Add Cortex-A8 definition. Move Thumb symbol around. --- target/config/Config.in | 5 ++ target/config/Config.in.arm | 5 -- target/config/Config.in.arm.choice | 94 ------------------------------------ target/config/Config.in.arm.default | 7 --- target/config/Config.in.cpu | 6 +++ target/config/Config.in.cris | 5 -- target/config/Config.in.cris.choice | 16 ------ target/config/Config.in.cris.default | 13 ----- target/config/Config.in.subsystem | 55 +++++++++++++++++++++ target/config/Config.in.tc | 90 ++++++++++++++++++++++++++++++++++ target/config/Config.in.x86 | 5 -- target/config/Config.in.x86.choice | 25 ---------- target/config/Config.in.x86.default | 22 --------- 13 files changed, 156 insertions(+), 192 deletions(-) delete mode 100644 target/config/Config.in.arm delete mode 100644 target/config/Config.in.arm.choice delete mode 100644 target/config/Config.in.arm.default delete mode 100644 target/config/Config.in.cris delete mode 100644 target/config/Config.in.cris.choice delete mode 100644 target/config/Config.in.cris.default create mode 100644 target/config/Config.in.subsystem create mode 100644 target/config/Config.in.tc delete mode 100644 target/config/Config.in.x86 delete mode 100644 target/config/Config.in.x86.choice delete mode 100644 target/config/Config.in.x86.default (limited to 'target/config') diff --git a/target/config/Config.in b/target/config/Config.in index dcef7ad51..a4c2f9dae 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -26,6 +26,11 @@ config ADK_TARGET_QEMU config ADK_TARGET_VBOX bool +config ADK_TARGET_ARCH_ARM_WITH_THUMB + bool + select ADK_KERNEL_THUMB2_KERNEL + depends on ADK_TARGET_ARCH_ARM + # the inverse of ADK_TARGET_KERNEL_CUSTOMISING, # allows for selecting it off (i.e., to disable it) config ADK_TARGET_FIXED_KERNEL diff --git a/target/config/Config.in.arm b/target/config/Config.in.arm deleted file mode 100644 index 5c25bf08c..000000000 --- a/target/config/Config.in.arm +++ /dev/null @@ -1,5 +0,0 @@ -# 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.arm.choice -source target/config/Config.in.arm.default diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice deleted file mode 100644 index ecb9be64d..000000000 --- a/target/config/Config.in.arm.choice +++ /dev/null @@ -1,94 +0,0 @@ -# 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_ARM_CPU_ARCH -prompt "CPU architecture and family" -depends on ADK_TARGET_TOOLCHAIN && ADK_TARGET_ARCH_ARM - -config ADK_CPU_ARMV7A_CORTEX_A9 - bool "cortex-a9" - select ADK_CPU_CORTEX_A9 - -config ADK_CPU_ARMV7A_CORTEX_A7 - bool "cortex-a7" - select ADK_CPU_CORTEX_A7 - -config ADK_CPU_ARMV7M_CORTEX_M4 - bool "cortex-m4" - select ADK_CPU_CORTEX_M4 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_UCLINUX - -config ADK_CPU_ARMV7M_CORTEX_M3 - bool "cortex-m3" - select ADK_CPU_CORTEX_M3 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_UCLINUX - -config ADK_CPU_ARMV6_ARM1176JZF_S - bool "arm1176jzf-s (armv6)" - select ADK_CPU_ARM1176JZF_S - -config ADK_CPU_ARMV5TE_ARM926EJ_S - bool "arm926ej-s (armv5te)" - select ADK_CPU_ARM926EJ_S - -config ADK_CPU_ARMV5TE_XSCALE - bool "xscale" - select ADK_CPU_XSCALE - -endchoice - -choice -prompt "Solidrun IMX6 model" -depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - -config ADK_TARGET_CUBOX_I4PRO - bool "Solidrun Cubox-i4Pro" - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_SDIO - select ADK_TARGET_WITH_SATA - -config ADK_TARGET_CUBOX_I2ULTRA - bool "Solidrun Cubox-i2Ultra" - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_SDIO - select ADK_TARGET_WITH_SATA - -config ADK_TARGET_CUBOX_I2EX - bool "Solidrun Cubox-i2eX" - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_SDIO - select ADK_TARGET_WITH_SATA - -config ADK_TARGET_CUBOX_I2 - bool "Solidrun Cubox-i2" - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_SDIO - -config ADK_TARGET_CUBOX_I1 - bool "Solidrun Cubox-i1" - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_WITH_SDIO - -config ADK_TARGET_HUMMINGBOARD_I1 - bool "Solidrun Hummingboard-i1" - -config ADK_TARGET_HUMMINGBOARD_I2 - bool "Solidrun Hummingboard-i2" - select ADK_TARGET_WITH_SMP - -config ADK_TARGET_HUMMINGBOARD_I2EX - bool "Solidrun Hummingboard-i2eX" - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_SATA - -endchoice diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default deleted file mode 100644 index bc233a2ad..000000000 --- a/target/config/Config.in.arm.default +++ /dev/null @@ -1,7 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -config ADK_TARGET_ARCH_ARM_WITH_THUMB - bool - select ADK_KERNEL_THUMB2_KERNEL - depends on ADK_TARGET_ARCH_ARM diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 15d1cc6e6..10909a12e 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -83,6 +83,11 @@ config ADK_CPU_CORTEX_A7 select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 +config ADK_CPU_CORTEX_A8 + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + config ADK_CPU_CORTEX_A9 bool select ADK_TARGET_WITH_NPTL @@ -302,6 +307,7 @@ config ADK_TARGET_GCC_CPU default "arm926ej-s" if ADK_CPU_ARM926EJ_S default "armv8-a" if ADK_CPU_ARMV8 default "cortex-a7" if ADK_CPU_CORTEX_A7 + default "cortex-a8" if ADK_CPU_CORTEX_A8 default "cortex-a9" if ADK_CPU_CORTEX_A9 default "cortex-a53" if ADK_CPU_CORTEX_A53 default "cortex-a57" if ADK_CPU_CORTEX_A57 diff --git a/target/config/Config.in.cris b/target/config/Config.in.cris deleted file mode 100644 index 3dc12a897..000000000 --- a/target/config/Config.in.cris +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index b55801bbb..000000000 --- a/target/config/Config.in.cris.choice +++ /dev/null @@ -1,16 +0,0 @@ -# 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_TARGET_ARCH_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 deleted file mode 100644 index a307897a0..000000000 --- a/target/config/Config.in.cris.default +++ /dev/null @@ -1,13 +0,0 @@ -# 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/config/Config.in.subsystem b/target/config/Config.in.subsystem new file mode 100644 index 000000000..dab19f2b4 --- /dev/null +++ b/target/config/Config.in.subsystem @@ -0,0 +1,55 @@ +choice +prompt "Solidrun IMX6 model" +depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + +config ADK_TARGET_CUBOX_I4PRO + bool "Solidrun Cubox-i4Pro" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA + +config ADK_TARGET_CUBOX_I2ULTRA + bool "Solidrun Cubox-i2Ultra" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA + +config ADK_TARGET_CUBOX_I2EX + bool "Solidrun Cubox-i2eX" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + select ADK_TARGET_WITH_SATA + +config ADK_TARGET_CUBOX_I2 + bool "Solidrun Cubox-i2" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_SDIO + +config ADK_TARGET_CUBOX_I1 + bool "Solidrun Cubox-i1" + select ADK_TARGET_WITH_WIFI + select ADK_TARGET_WITH_SDIO + +config ADK_TARGET_HUMMINGBOARD_I1 + bool "Solidrun Hummingboard-i1" + +config ADK_TARGET_HUMMINGBOARD_I2 + bool "Solidrun Hummingboard-i2" + select ADK_TARGET_WITH_SMP + +config ADK_TARGET_HUMMINGBOARD_I2EX + bool "Solidrun Hummingboard-i2eX" + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_SATA + +endchoice + + diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc new file mode 100644 index 000000000..ab2ead75d --- /dev/null +++ b/target/config/Config.in.tc @@ -0,0 +1,90 @@ +# 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_CPU +prompt "CPU type" +depends on ADK_TARGET_TOOLCHAIN && \ + ( ADK_TARGET_ARCH_CRIS \ + || ADK_TARGET_ARCH_ARM \ + || ADK_TARGET_ARCH_X86 ) + +config ADK_TARGET_CPU_ARM_CORTEX_A9 + bool "cortex-a9" + select ADK_CPU_CORTEX_A9 + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_A8 + bool "cortex-a8" + select ADK_CPU_CORTEX_A8 + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_A7 + bool "cortex-a7" + select ADK_CPU_CORTEX_A7 + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_M4 + bool "cortex-m4" + select ADK_CPU_CORTEX_M4 + select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_M3 + bool "cortex-m3" + select ADK_CPU_CORTEX_M3 + select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_UCLINUX + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_ARM1176JZF_S + bool "arm1176jzf-s" + select ADK_CPU_ARM1176JZF_S + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_ARM926EJ_S + bool "arm926ej-s" + select ADK_CPU_ARM926EJ_S + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_XSCALE + bool "xscale" + select ADK_CPU_XSCALE + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_CRIS_V10 + bool "cris v10" + select ADK_CPU_CRIS_V10 + depends on ADK_TARGET_ARCH_CRIS + +config ADK_TARGET_CPU_CRIS_V32 + bool "cris v32" + select ADK_CPU_CRIS_V32 + depends on ADK_TARGET_ARCH_CRIS + +config ADK_TARGET_CPU_X86_I486 + bool "i486" + select ADK_CPU_I486 + depends on ADK_TARGET_ARCH_X86 + +config ADK_TARGET_CPU_X86_I586 + bool "i586" + select ADK_CPU_I586 + depends on ADK_TARGET_ARCH_X86 + +config ADK_TARGET_CPU_X86_I686 + bool "i686" + select ADK_CPU_I686 + depends on ADK_TARGET_ARCH_X86 + +config ADK_TARGET_CPU_X86_GEODE + bool "geode" + select ADK_CPU_GEODE + depends on ADK_TARGET_ARCH_X86 + +config ADK_TARGET_CPU_X86_ATOM + bool "atom" + select ADK_CPU_ATOM + depends on ADK_TARGET_ARCH_X86 + +endchoice diff --git a/target/config/Config.in.x86 b/target/config/Config.in.x86 deleted file mode 100644 index 3bbae5db1..000000000 --- a/target/config/Config.in.x86 +++ /dev/null @@ -1,5 +0,0 @@ -# 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.x86.choice -source target/config/Config.in.x86.default diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice deleted file mode 100644 index fb6b848d4..000000000 --- a/target/config/Config.in.x86.choice +++ /dev/null @@ -1,25 +0,0 @@ -# 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_X86_CPU_ARCH -prompt "CPU architecture" -depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TARGET_SYSTEM_VBOX_X86 || ADK_TARGET_TOOLCHAIN) && ADK_TARGET_ARCH_X86 -default ADK_CPU_I486 - -config ADK_CPU_I486 - bool "i486" - select ADK_i486 - -config ADK_CPU_I586 - bool "i586" - select ADK_i586 - -config ADK_CPU_I686 - bool "i686" - select ADK_i686 - -config ADK_CPU_ATOM - bool "atom" - select ADK_atom - -endchoice diff --git a/target/config/Config.in.x86.default b/target/config/Config.in.x86.default deleted file mode 100644 index eb92bf3e1..000000000 --- a/target/config/Config.in.x86.default +++ /dev/null @@ -1,22 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -config ADK_i486 - bool - -config ADK_i586 - bool - -config ADK_i686 - bool - -config ADK_atom - bool - -config ADK_TARGET_X86_CPU - string - default "i486" if ADK_i486 - default "i586" if ADK_i586 - default "i686" if ADK_i686 - default "atom" if ADK_atom - -- cgit v1.2.3