diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2018-05-25 13:36:17 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-05-25 21:16:12 +0200 |
commit | 08317fa541a10bd2e385479d73e99348cc2351dd (patch) | |
tree | a3b86ffff6c225c695c748bb417284768922acca /target/linux | |
parent | ac941fcdd80d48404c91e8035a5836086f0a40ee (diff) |
rework hardware and C library settings
Make the menu system for configuration more intuitive.
First choose operating system, then hardware, starting with architecture.
Then choose either generic or a sample system. When choosing a sample be more strict
in case of MMU or Endianess selection, so a misconfiguration isn't possible.
Furthermore put a new top level menu for C library configuration and
add Binary format, Instruction set, version selection, float type and
any C library specific options.
Refactor the duplicate definition of Qemu system versatile and Synopsys NSIM.
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/Config.in | 1 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.arc | 25 | ||||
-rw-r--r-- | target/linux/config/Config.in.arm | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.bus | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.ethernet | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.serial | 2 |
7 files changed, 27 insertions, 16 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in index 59d24d43f..e4da0762b 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -19,6 +19,7 @@ source target/linux/config/Config.in.audio source target/linux/config/Config.in.multimedia source target/linux/config/Config.in.crypto source target/linux/config/Config.in.misc +source target/linux/config/Config.in.arc source target/linux/config/Config.in.arm source target/linux/config/Config.in.mips source target/linux/config/Config.in.xtensa diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index ceffb3326..9e8b9c5da 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -72,7 +72,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_4 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU config ADK_TARGET_LINUX_KERNEL_VERSION_4_1 bool "4.1.51" @@ -88,7 +87,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_1 depends on !ADK_TARGET_ARCH_RISCV64 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 @@ -111,7 +109,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_3_16 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -140,7 +137,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_3_2 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -163,7 +159,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 diff --git a/target/linux/config/Config.in.arc b/target/linux/config/Config.in.arc new file mode 100644 index 000000000..e1b7f8f94 --- /dev/null +++ b/target/linux/config/Config.in.arc @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_LINUX_KERNEL_ISA_ARCOMPACT + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC700 + +config ADK_LINUX_KERNEL_ARC_CPU_770 + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC700 + +config ADK_LINUX_KERNEL_ISA_ARCV2 + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC_HS + +config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME + string + depends on ADK_TARGET_ARCH_ARC + default "nsim_hs" if ADK_TARGET_CPU_ARC_ARC_HS + default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 + + diff --git a/target/linux/config/Config.in.arm b/target/linux/config/Config.in.arm index 6456e1af8..3442d53f5 100644 --- a/target/linux/config/Config.in.arm +++ b/target/linux/config/Config.in.arm @@ -5,9 +5,3 @@ config ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT bool depends on ADK_TARGET_ARCH_ARM -config ADK_LINUX_KERNEL_ARCH_VERSATILE_PB - bool - select ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT - default y if !ADK_TARGET_WITH_DEVICETREE - depends on ADK_TARGET_ARCH_ARM - diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus index cddabdeb1..c826ef83a 100644 --- a/target/linux/config/Config.in.bus +++ b/target/linux/config/Config.in.bus @@ -8,9 +8,9 @@ config ADK_LINUX_KERNEL_PCI || ADK_TARGET_QEMU \ || ADK_TARGET_VBOX \ || ADK_TARGET_GENERIC - default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default n if ADK_TARGET_CPU_XTENSA_DE212 default n if ADK_TARGET_SYSTEM_GENERIC_NDS32 + default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB default y config ADK_LINUX_KERNEL_PCI_QUIRKS diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 304ecf7e0..48b4d29ec 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -243,10 +243,8 @@ config ADK_LINUX_KERNEL_SMC91X select ADK_LINUX_KERNEL_NET_VENDOR_SMSC select ADK_LINUX_KERNEL_GPIOLIB depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \ - ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU || \ ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default n help diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 3944c50d6..6508e8f21 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -244,13 +244,11 @@ config ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 depends on ADK_TARGET_BOARD_BCM28XX \ || ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \ || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ - || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \ || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default n help |