From 08317fa541a10bd2e385479d73e99348cc2351dd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 May 2018 13:36:17 +0200 Subject: 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. --- target/linux/config/Config.in.arc | 25 +++++++++++++++++++++++++ target/linux/config/Config.in.arm | 6 ------ target/linux/config/Config.in.bus | 2 +- target/linux/config/Config.in.ethernet | 2 -- target/linux/config/Config.in.serial | 2 -- 5 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 target/linux/config/Config.in.arc (limited to 'target/linux/config') 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 -- cgit v1.2.3