From c384dc577bd32f3315bacb410fc31610b41f742c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Mar 2016 12:51:42 +0100 Subject: rework menu based config system After the addition of bare metal toolchains the menu system allowed to create non-valid configurations. I reworked it so we can also add other operating system support if we wish. So first you choose your operating system, then your architecture and endianess, after that your embedded system, emulator or generic device and then you choose your task you want to run. Tasks may be toolchain, a new appliance/application or some preconfigured sets of packages and configurations as kodi, mpd, firefox and more. The tasks are limited to a plausible choice of hardware and software. Deduplicate CPU configuration. You don't wanna compile Kodi for a H8/300 microcontroller ;) --- target/x86/systems/generic-x86 | 22 ---------------------- target/x86/systems/ibm-x40 | 2 +- target/x86/systems/pcengines-alix | 2 +- target/x86/systems/qemu-x86 | 2 +- target/x86/systems/toolchain-x86 | 7 ------- 5 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 target/x86/systems/generic-x86 delete mode 100644 target/x86/systems/toolchain-x86 (limited to 'target/x86') diff --git a/target/x86/systems/generic-x86 b/target/x86/systems/generic-x86 deleted file mode 100644 index ebe352908..000000000 --- a/target/x86/systems/generic-x86 +++ /dev/null @@ -1,22 +0,0 @@ -config ADK_TARGET_SYSTEM_GENERIC_X86 - bool "Generic x86 PC (i686)" - select ADK_CPU_I686 - select ADK_TARGET_KERNEL_BZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - select ADK_TARGET_WITH_ACPI - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_SERIAL - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_NET - select ADK_TARGET_WITH_NETDEVICE - select ADK_TARGET_WITH_BLOCK - select ADK_TARGET_WITH_PATA - select ADK_TARGET_WITH_SATA - select ADK_TARGET_WITH_IOMMU - select ADK_TARGET_CPU_WITH_MTRR - select ADK_PACKAGE_GRUB - help - Example config for generic i686 based PC. - You need to enable all required drivers manually. - diff --git a/target/x86/systems/ibm-x40 b/target/x86/systems/ibm-x40 index 6cbc55eae..415e34598 100644 --- a/target/x86/systems/ibm-x40 +++ b/target/x86/systems/ibm-x40 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_IBM_X40 bool "IBM X40 laptop" - select ADK_CPU_PENTIUM_M + select ADK_TARGET_CPU_X86_PENTIUM_M select ADK_TARGET_CPU_WITH_MMX select ADK_TARGET_CPU_WITH_SSE select ADK_TARGET_CPU_WITH_SSE2 diff --git a/target/x86/systems/pcengines-alix b/target/x86/systems/pcengines-alix index 6dd775743..ae0f13720 100644 --- a/target/x86/systems/pcengines-alix +++ b/target/x86/systems/pcengines-alix @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX bool "PCengines ALIX" - select ADK_CPU_GEODE + select ADK_TARGET_CPU_X86_GEODE select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI diff --git a/target/x86/systems/qemu-x86 b/target/x86/systems/qemu-x86 index 97c1a6437..8d99218fc 100644 --- a/target/x86/systems/qemu-x86 +++ b/target/x86/systems/qemu-x86 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_QEMU_X86 bool "Qemu Emulator" - select ADK_CPU_I686 + select ADK_TARGET_CPU_X86_I686 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_BZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/x86/systems/toolchain-x86 b/target/x86/systems/toolchain-x86 deleted file mode 100644 index aa30ffea2..000000000 --- a/target/x86/systems/toolchain-x86 +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 - bool "Toolchain only" - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - X86 toolchain. - -- cgit v1.2.3