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 ;) --- .gitignore | 10 +- Config.in | 74 +- adk/config/symbol.c | 2 + adk/tools/pkgrebuild.c | 8 +- docs/adding-boards.txt | 8 +- mk/build.mk | 52 +- mk/image.mk | 2 + mk/vars.mk | 22 +- package/Config.in.options | 72 + package/boost/Makefile | 4 +- package/ffmpeg/Makefile | 3 +- package/kodi/Makefile | 3 - package/libgcc/Makefile | 4 +- package/libvpx/Makefile | 2 +- package/mpg123/Makefile | 4 +- rules.mk | 3 +- scripts/create-menu | 45 +- target/aarch64/kernel/generic-aarch64 | 1 + target/aarch64/systems/arm-fm | 4 +- target/aarch64/systems/qemu-aarch64 | 4 +- target/aarch64/systems/toolchain-aarch64 | 9 - target/alpha/kernel/generic-alpha | 1 + target/alpha/systems/qemu-alpha | 2 +- target/alpha/systems/toolchain-alpha | 8 - target/appliances/000default.appliance | 5 - target/appliances/default.options | 5 - target/appliances/development.appliance | 24 - target/appliances/firefox.appliance | 28 - target/appliances/kodi.appliance | 37 - target/appliances/mpd.appliance | 47 - target/appliances/mpd.options | 17 - target/appliances/test.appliance | 8 - target/arc/kernel/generic-arc | 1 + target/arc/systems/nsim-arcv1 | 2 +- target/arc/systems/nsim-arcv2 | 2 +- target/arc/systems/toolchain-arc | 7 - target/arm/kernel/generic-arm | 1 + target/arm/systems/banana-pro | 4 +- target/arm/systems/beaglebone-black | 4 +- target/arm/systems/kinetis-k70 | 4 +- target/arm/systems/linksys-nslu2 | 4 +- target/arm/systems/qemu-arm-realview-eb-mpcore | 4 +- target/arm/systems/qemu-arm-spitz | 4 +- target/arm/systems/qemu-arm-terrier | 4 +- target/arm/systems/qemu-arm-versatilepb | 4 +- target/arm/systems/qemu-arm-vexpress-a9 | 4 +- target/arm/systems/raspberry-pi | 4 +- target/arm/systems/raspberry-pi2 | 4 +- target/arm/systems/sharp-zaurus | 4 +- target/arm/systems/solidrun-imx6 | 4 +- target/arm/systems/toolchain-arm | 7 - target/avr32/kernel/generic-avr32 | 1 + target/avr32/systems/atmel-ngw100 | 2 +- target/avr32/systems/toolchain-avr32 | 8 - target/bfin/kernel/generic-bfin | 1 + target/bfin/systems/sim-bfin | 1 - target/bfin/systems/toolchain-bfin | 8 - target/c6x/systems/toolchain-c6x | 9 - target/config/Config.in | 11 +- target/config/Config.in.adk | 26 +- target/config/Config.in.archopts | 9 + target/config/Config.in.binfmt | 1 + target/config/Config.in.binutils | 6 +- target/config/Config.in.cpu | 1979 +++++++++++--------- target/config/Config.in.endian | 27 +- target/config/Config.in.fpu | 20 +- target/config/Config.in.kernelversion | 4 +- target/config/Config.in.libc | 78 +- target/config/Config.in.mips | 40 - target/config/Config.in.os | 17 + target/config/Config.in.qemuopts | 4 + target/config/Config.in.rootfs | 14 +- target/config/Config.in.systemopts | 38 + target/config/Config.in.target | 70 +- target/config/Config.in.tc | 675 ------- target/config/Config.in.toolchain | 21 +- target/config/Config.in.x86_64 | 15 - target/config/Config.in.xtensa | 49 - target/cris/systems/qemu-cris | 2 +- target/cris/systems/toolchain-cris | 7 - target/frv/systems/sim-frv | 2 +- target/frv/systems/toolchain-frv | 8 - target/h8300/systems/sim-h8300h | 2 +- target/h8300/systems/toolchain-h8300 | 8 - target/hppa/systems/toolchain-hppa | 8 - target/ia64/systems/toolchain-ia64 | 8 - target/linux/config/Config.in.i2c | 4 +- target/linux/config/Config.in.watchdog | 2 +- target/linux/config/Config.in.xtensa | 4 +- target/lm32/systems/qemu-lm32 | 2 +- target/lm32/systems/toolchain-lm32 | 12 - target/m68k/systems/aranym-m68k | 2 +- target/m68k/systems/qemu-m68k-mcf5208 | 2 +- target/m68k/systems/qemu-m68k-q800 | 2 +- target/m68k/systems/toolchain-m68k | 7 - target/metag/systems/qemu-metag | 2 +- target/metag/systems/toolchain-metag | 8 - target/microblaze/systems/qemu-microblaze-ml605 | 2 +- .../microblaze/systems/qemu-microblaze-s3adsp1800 | 2 +- target/microblaze/systems/toolchain-microblaze | 7 - target/mips/kernel/generic-mips | 1 + target/mips/systems/dragino-ms14s | 4 +- target/mips/systems/imgtec-ci20 | 4 +- target/mips/systems/mikrotik-rb4xx | 4 +- target/mips/systems/mikrotik-rb532 | 4 +- target/mips/systems/toolchain-mips | 7 - target/mips64/kernel/generic-mips64 | 1 + target/mips64/systems/lemote-yeelong | 4 +- target/mips64/systems/qemu-mips64 | 1 - target/mips64/systems/toolchain-mips64 | 8 - target/moxie/systems/toolchain-moxie | 8 - target/nds32/systems/toolchain-nds32 | 8 - target/nios2/systems/toolchain-nios2 | 8 - target/or1k/systems/or1k-sim | 2 +- target/or1k/systems/qemu-or1k | 2 +- target/or1k/systems/toolchain-or1k | 8 - target/ppc/kernel/generic-ppc | 2 + target/ppc/systems/mac-mini | 2 +- target/ppc/systems/qemu-ppc-bamboo | 2 +- target/ppc/systems/qemu-ppc-macppc | 2 +- target/ppc/systems/toolchain-ppc | 8 - target/ppc64/kernel/generic-ppc64 | 1 + target/ppc64/systems/qemu-ppc64 | 2 +- target/ppc64/systems/toolchain-ppc64 | 7 - target/qarch.lst | 11 - target/s390/systems/qemu-s390 | 2 +- target/s390/systems/toolchain-s390 | 8 - target/sh/kernel/generic-sh | 2 + target/sh/systems/numato-mimasv2 | 2 +- target/sh/systems/qemu-sh | 2 +- target/sh/systems/toolchain-sh | 7 - target/sparc/kernel/generic-sparc | 2 + target/sparc/systems/qemu-sparc | 2 +- target/sparc/systems/sun-voyager | 2 +- target/sparc/systems/toolchain-sparc | 7 - target/sparc64/kernel/generic-sparc64 | 2 + target/sparc64/systems/qemu-sparc64 | 2 +- target/sparc64/systems/toolchain-sparc64 | 8 - target/tile/systems/toolchain-tile | 8 - target/v850/systems/toolchain-v850 | 8 - 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 - target/x86_64/systems/generic-x86_64 | 22 - target/x86_64/systems/pcengines-apu | 2 +- target/x86_64/systems/qemu-x86_64 | 2 +- target/x86_64/systems/toolchain-x86_64 | 8 - target/xtensa/Makefile | 8 +- target/xtensa/systems/qemu-xtensa | 1 - target/xtensa/systems/toolchain-xtensa | 8 - target/xtensa/systems/xilinx-kintex7 | 1 - tasks/000-new | 5 + tasks/001-toolchain | 5 + tasks/002-mpd | 48 + tasks/003-kodi | 41 + tasks/004-development | 25 + tasks/005-firefox | 31 + tasks/006-test | 9 + toolchain/binutils/Makefile | 4 +- toolchain/gcc/Makefile | 20 +- toolchain/kernel-headers/Makefile | 2 +- toolchain/uclibc-ng/Makefile | 28 +- 164 files changed, 1745 insertions(+), 2562 deletions(-) create mode 100644 package/Config.in.options create mode 100644 target/aarch64/kernel/generic-aarch64 delete mode 100644 target/aarch64/systems/toolchain-aarch64 create mode 100644 target/alpha/kernel/generic-alpha delete mode 100644 target/alpha/systems/toolchain-alpha delete mode 100644 target/appliances/000default.appliance delete mode 100644 target/appliances/default.options delete mode 100644 target/appliances/development.appliance delete mode 100644 target/appliances/firefox.appliance delete mode 100644 target/appliances/kodi.appliance delete mode 100644 target/appliances/mpd.appliance delete mode 100644 target/appliances/mpd.options delete mode 100644 target/appliances/test.appliance create mode 100644 target/arc/kernel/generic-arc delete mode 100644 target/arc/systems/toolchain-arc create mode 100644 target/arm/kernel/generic-arm delete mode 100644 target/arm/systems/toolchain-arm create mode 100644 target/avr32/kernel/generic-avr32 delete mode 100644 target/avr32/systems/toolchain-avr32 create mode 100644 target/bfin/kernel/generic-bfin delete mode 100644 target/bfin/systems/toolchain-bfin delete mode 100644 target/c6x/systems/toolchain-c6x create mode 100644 target/config/Config.in.archopts delete mode 100644 target/config/Config.in.mips create mode 100644 target/config/Config.in.os create mode 100644 target/config/Config.in.systemopts delete mode 100644 target/config/Config.in.tc delete mode 100644 target/config/Config.in.x86_64 delete mode 100644 target/config/Config.in.xtensa delete mode 100644 target/cris/systems/toolchain-cris delete mode 100644 target/frv/systems/toolchain-frv delete mode 100644 target/h8300/systems/toolchain-h8300 delete mode 100644 target/hppa/systems/toolchain-hppa delete mode 100644 target/ia64/systems/toolchain-ia64 delete mode 100644 target/lm32/systems/toolchain-lm32 delete mode 100644 target/m68k/systems/toolchain-m68k delete mode 100644 target/metag/systems/toolchain-metag delete mode 100644 target/microblaze/systems/toolchain-microblaze create mode 100644 target/mips/kernel/generic-mips delete mode 100644 target/mips/systems/toolchain-mips create mode 100644 target/mips64/kernel/generic-mips64 delete mode 100644 target/mips64/systems/toolchain-mips64 delete mode 100644 target/moxie/systems/toolchain-moxie delete mode 100644 target/nds32/systems/toolchain-nds32 delete mode 100644 target/nios2/systems/toolchain-nios2 delete mode 100644 target/or1k/systems/toolchain-or1k create mode 100644 target/ppc/kernel/generic-ppc delete mode 100644 target/ppc/systems/toolchain-ppc create mode 100644 target/ppc64/kernel/generic-ppc64 delete mode 100644 target/ppc64/systems/toolchain-ppc64 delete mode 100644 target/qarch.lst delete mode 100644 target/s390/systems/toolchain-s390 create mode 100644 target/sh/kernel/generic-sh delete mode 100644 target/sh/systems/toolchain-sh create mode 100644 target/sparc/kernel/generic-sparc delete mode 100644 target/sparc/systems/toolchain-sparc create mode 100644 target/sparc64/kernel/generic-sparc64 delete mode 100644 target/sparc64/systems/toolchain-sparc64 delete mode 100644 target/tile/systems/toolchain-tile delete mode 100644 target/v850/systems/toolchain-v850 delete mode 100644 target/x86/systems/generic-x86 delete mode 100644 target/x86/systems/toolchain-x86 delete mode 100644 target/x86_64/systems/generic-x86_64 delete mode 100644 target/x86_64/systems/toolchain-x86_64 delete mode 100644 target/xtensa/systems/toolchain-xtensa create mode 100644 tasks/000-new create mode 100644 tasks/001-toolchain create mode 100644 tasks/002-mpd create mode 100644 tasks/003-kodi create mode 100644 tasks/004-development create mode 100644 tasks/005-firefox create mode 100644 tasks/006-test diff --git a/.gitignore b/.gitignore index f5fa5dac6..c1a6e521e 100644 --- a/.gitignore +++ b/.gitignore @@ -50,9 +50,13 @@ /extra/ /target/*/Config.in.arch /target/*/Config.in.systems -/target/config/Config.in.appliances -/target/config/Config.in.system* -/target/config/Config.in.arch* +/target/config/Config.in.tasks +/target/config/Config.in.system +/target/config/Config.in.system.choice +/target/config/Config.in.system.default +/target/config/Config.in.arch +/target/config/Config.in.arch.choice +/target/config/Config.in.arch.default /target/config/Config.in.scripts /target/config/Config.in.prereq /target/m68k/aranym.cfg diff --git a/Config.in b/Config.in index 2eb75d661..5f383e61e 100644 --- a/Config.in +++ b/Config.in @@ -13,95 +13,47 @@ config ADK_HAVE_DOT_CONFIG bool default y -source "target/config/Config.in.appliances" - -menu "Target configuration" - visible if !ADK_CHOOSE_APPLIANCE - -source "target/config/Config.in.cpu" +source "target/config/Config.in.os" source "target/config/Config.in.hardware" source "target/config/Config.in.boards" source "target/config/Config.in.kernelfmt" source "target/config/Config.in.arch" +source "target/config/Config.in.endian" +source "target/config/Config.in.archopts" source "target/config/Config.in.system" +source "target/config/Config.in.systemopts" source "target/config/Config.in.subsystem" -source "target/config/Config.in.tc" -source "target/config/Config.in.xtensa" source "target/config/Config.in.qemuopts" +source "target/config/Config.in.cpu" +source "target/config/Config.in.tasks" source "target/config/Config.in.rootfs" source "target/config/Config.in.target" -endmenu - source "target/config/Config.in" menu "Package selection" - visible if !ADK_CHOOSE_APPLIANCE - + visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN source "package/Config.in.auto.global" source "package/Config.in" - menu "Package options" - visible if !ADK_CHOOSE_APPLIANCE - -config ADK_LEAVE_ETC_ALONE - bool "do not install anything into /etc" - default n - help - Enabling this option will prevent the ADK from installing anything - into /etc. This is useful for highly customised setups with custom - base-files packages. - - Package Makefiles can override this setting by passing "force_etc" to - the package-template. to a non-empty value. This is useful for - packages traditionally installing non-config stuff into /etc, like - e.g. ca-certificates. - - Note that without further customisation, turning this option - on will almost certainly render the resulting system unusable. - -config ADK_INSTALL_PACKAGE_INIT_SCRIPTS - bool "ship custom init-scripts along with packages" - default y - depends on !ADK_LEAVE_ETC_ALONE - help - Turning this option to false will prevent the ADK from - installing init-scripts (i.e. files in /etc/init.d) for - certain daemons and daemon-like applications. - - Note that without further customisation, turning this option - off will almost certainly render the resulting system unusable. - -config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS - bool "ship custom network-scripts along with packages" - default y - depends on !ADK_LEAVE_ETC_ALONE - help - Turning this option to false will prevent the ADK from - installing network-scripts (i.e. files in /etc/network/) for - packages providing any. - - Note that without further customisation, turning this option - off will almost certainly render the resulting system unusable. - +source "package/Config.in.options" endmenu endmenu menu "Runtime configuration" - visible if !ADK_CHOOSE_APPLIANCE + visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN source "target/config/Config.in.runtime" endmenu -menu "Kernel configuration" - visible if !ADK_CHOOSE_APPLIANCE && ADK_TARGET_KERNEL_CUSTOMISING - source "target/config/Config.in.kernelversion" + +menu "Kernel configuration" + visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN source "target/config/Config.in.kernelcfg" source "target/linux/Config.in" endmenu menu "Toolchain settings" - visible if !ADK_CHOOSE_APPLIANCE config ADK_VENDOR string "Vendor name" @@ -109,8 +61,6 @@ config ADK_VENDOR help Vendor string is used for toolchain. -source "target/config/Config.in.endian" -source "target/config/Config.in.mips" source "target/config/Config.in.fpu" source "target/config/Config.in.float" source "target/config/Config.in.binfmt" diff --git a/adk/config/symbol.c b/adk/config/symbol.c index 27f8117d4..685a1ab14 100644 --- a/adk/config/symbol.c +++ b/adk/config/symbol.c @@ -393,6 +393,7 @@ void sym_calc_value(struct symbol *sym) } calc_newval: if (sym->dir_dep.tri == no) { + /* if (sym->rev_dep.tri != no) { fprintf(stderr, "warning: ("); expr_fprint(sym->rev_dep.expr, stderr); @@ -401,6 +402,7 @@ void sym_calc_value(struct symbol *sym) expr_fprint(sym->dir_dep.expr, stderr); fprintf(stderr, ")\n"); } + */ for (esv = sym->val_dep; esv; esv = esv->next) { if ((esv->tri != no) && (expr_calc_value(esv->value) != no)) { diff --git a/adk/tools/pkgrebuild.c b/adk/tools/pkgrebuild.c index e7f037ae5..b4a63d89c 100644 --- a/adk/tools/pkgrebuild.c +++ b/adk/tools/pkgrebuild.c @@ -231,8 +231,10 @@ int main() { closedir(pkgdir); config = fopen(".config", "r"); - if (config == NULL) + if (config == NULL) { perror(".config is missing."); + exit(1); + } configmap = strmap_new(1024); while (fgets(buf, 128, config) != NULL) { @@ -245,8 +247,10 @@ int main() { fclose(config); configold = fopen(".config.old", "r"); - if (configold == NULL) + if (configold == NULL) { perror(".config.old is missing."); + exit(1); + } configoldmap = strmap_new(1024); while (fgets(buf, 128, configold) != NULL) { diff --git a/docs/adding-boards.txt b/docs/adding-boards.txt index 4066fd822..4f18dbc08 100644 --- a/docs/adding-boards.txt +++ b/docs/adding-boards.txt @@ -16,8 +16,8 @@ target/arm/systems/raspberry-pi2 --------------------- config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" - select ADK_CPU_CORTEX_A7 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA @@ -44,10 +44,10 @@ in OpenADK, you need to port it first. The hardware capabilities are optional. (f.e. ADK_TARGET_WITH_SD), but required when you configure the driver configuration later. -For architectures with a choice for endianess you should select either +For architectures with a choice for endianess you should depends on either ADK_TARGET_LITTLE_ENDIAN or ADK_TARGET_BIG_ENDIAN. -If the CPU type like in this example ADK_CPU_CORTEX_A7 is not yet available +If the CPU type like in this example ADK_TARGET_CPU_ARM_CORTEX_A7 is not yet available you need to add it to target/config/Config.in.cpu. For optimized code generation you should also add ADK_TARGET_GCC_CPU or ADK_TARGET_GCC_ARCH symbol for your CPU type. Furthermore you need to decide if your CPU has a MMU, FPU and NPTL support diff --git a/mk/build.mk b/mk/build.mk index 691d78e17..0dcea0db6 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -157,15 +157,16 @@ ${ADK_TOPDIR}/package/Depends.mk: ${ADK_TOPDIR}/.config $(wildcard ${ADK_TOPDIR} world: @mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps -ifeq ($(ADK_TARGET_TOOLCHAIN),y) -ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final package/compile +ifeq ($(ADK_APPLIANCE_TOOLCHAIN),y) + $(MAKE) -f mk/build.mk package/hostcompile toolchain/final else - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final package/compile root_clean package/install +ifeq ($(ADK_TARGET_OS_BAREMETAL),y) + $(MAKE) -f mk/build.mk package/hostcompile toolchain/final endif -else +ifeq ($(ADK_TARGET_OS_LINUX),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif +endif package_index: ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) @@ -265,7 +266,7 @@ cleandir: ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX) @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .menu .tmpconfig.h .rebuild* + @rm -f .menu .tmpconfig.h .rebuild* make.log @rm -f ${ADK_TOPDIR}/package/Depends.mk ${ADK_TOPDIR}/prereq.mk @printf "done\n" @@ -287,8 +288,10 @@ distclean: @rm -rf package/pkglist.d package/pkgconfigs.d @rm -f .config* .defconfig .tmpconfig.h all.config prereq.mk make.log @rm -f .firstrun .menu package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* - @rm -f target/*/Config.in.arch* target/*/Config.in.system* - @rm -f package/Config.in.auto* package/Config.in.appliances + @rm -f target/*/Config.in.arch target/*/Config.in.systems target/config/Config.in.tasks + @rm -f target/config/Config.in.arch.choice target/config/Config.in.arch.default + @rm -f target/config/Config.in.system.choice target/config/Config.in.system.default + @rm -f package/Config.in.auto* target/config/Config.in.system @rm -f target/config/Config.in.prereq target/config/Config.in.scripts @rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild @printf "done\n" @@ -378,11 +381,17 @@ defconfig: .menu $(CONFIG)/conf echo "ADK_PACKAGE_GLIBC_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \ fi @if [ ! -z "$(ADK_APPLIANCE)" ];then \ - grep "^config" target/config/Config.in.appliances \ + grep "^config" target/config/Config.in.tasks \ |grep -i "_$(ADK_APPLIANCE)$$" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(ADK_TARGET_OS)" ];then \ + grep "^config" target/config/Config.in.os \ + |grep -i "_$(ADK_TARGET_OS)$$" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(ADK_TOPDIR)/.defconfig; \ + fi @if [ ! -z "$(ADK_TARGET_ARCH)" ];then \ grep "^config" target/config/Config.in.arch.choice \ |grep -i "_$(ADK_TARGET_ARCH)$$" \ @@ -422,7 +431,7 @@ defconfig: .menu $(CONFIG)/conf fi @if [ ! -z "$(ADK_TARGET_CPU)" ];then \ cpu=$$(echo "$(ADK_TARGET_CPU)" |sed -e "s/-/_/g"); \ - grep -h "^config" target/config/Config.in.tc \ + grep -h "^config" target/config/Config.in.cpu \ |grep -i "$$cpu$$" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/.defconfig; \ @@ -453,19 +462,13 @@ defconfig: .menu $(CONFIG)/conf >> $(ADK_TOPDIR)/.defconfig; \ fi; \ fi - @if [ ! -z "$(ADK_TARGET_XTENSA)" ];then \ - grep "^config" target/config/Config.in.xtensa \ - |grep -i "$(ADK_TARGET_XTENSA)" \ - |sed -e "s#^config \(.*\)#\1=y#" \ - >> $(ADK_TOPDIR)/.defconfig; \ - fi @if [ ! -z "$(ADK_APPLIANCE)" ];then \ $(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \ fi allconfig: @if [ ! -z "$(ADK_APPLIANCE)" ];then \ - grep "^config" target/config/Config.in.appliances \ + grep "^config" target/config/Config.in.tasks \ |grep -i "_$(ADK_APPLIANCE)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/all.config; \ @@ -520,21 +523,16 @@ distclean cleandir: @rm -rf package/pkglist.d package/pkgconfigs.d @rm -f .config* .defconfig .tmpconfig.h all.config make.log @rm -f .menu .rebuild.* package/Depends.mk .ADK_HAVE_DOT_CONFIG prereq.mk - @rm -f target/*/Config.in.arch* - @rm -f target/*/Config.in.system* - @rm -f package/Config.in.auto* package/Config.in.appliances + @rm -f target/*/Config.in.arch target/*/Config.in.systems + @rm -f target/config/Config.in.arch.choice target/config/Config.in.arch.default + @rm -f target/config/Config.in.system.choice target/config/Config.in.system.default + @rm -f package/Config.in.auto* target/config/Config.in.system target/config/Config.in.tasks @rm -f target/config/Config.in.prereq target/config/Config.in.scripts @rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild @printf "done\n" endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -buildall: - @mkdir -p firmware - @echo "=== building $(ADK_TARGET_SYSTEM) ($(ADK_TARGET_ARCH)) with $(ADK_TARGET_LIBC) ===" - $(GMAKE) ADK_APPLIANCE=new ADK_TARGET_ARCH=$(ADK_TARGET_ARCH) ADK_TARGET_SYSTEM=$(ADK_TARGET_SYSTEM) ADK_TARGET_LIBC=$(ADK_TARGET_LIBC) allmodconfig - $(GMAKE) ADK_VERBOSE=1 all 2>&1 | tee firmware/buildall.log - $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c @@ -544,7 +542,7 @@ $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_T $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c @$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c -menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard target/appliances/*) +menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*) @printf " ---> generating menu structure.. " @$(SHELL) $(ADK_TOPDIR)/scripts/create-menu @$(ADK_TOPDIR)/adk/tools/pkgmaker diff --git a/mk/image.mk b/mk/image.mk index f88fd1e87..d700f00bb 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -1,6 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +ifeq ($(ADK_TARGET_OS_LINUX),y) # relative paths, like 'mksh' or '../usr/bin/foosh' ifeq (${ADK_BINSH_ASH},y) BINSH:=ash @@ -36,6 +37,7 @@ ROOTSH:=/bin/zsh else $(error No login shell configured!) endif +endif imageprepare: image-prepare-post extra-install prelink diff --git a/mk/vars.mk b/mk/vars.mk index 98e94c863..91587382e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,18 +9,21 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) -ADK_SUFFIX:= ${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH} -ifneq ($(ADK_TARGET_FLOAT),) -ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_FLOAT) +ADK_SUFFIX:= ${ADK_TARGET_SYSTEM} +ifneq ($(ADK_TARGET_ENDIAN_SUFFIX),) +ADK_SUFFIX:= $(ADK_SUFFIX)$(ADK_TARGET_ENDIAN_SUFFIX) endif -ifneq ($(ADK_TARGET_ABI),) -ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_ABI) +ifneq ($(ADK_TARGET_LIBC),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_LIBC) endif ifneq ($(ADK_TARGET_CPU_TYPE),) ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_CPU_TYPE) endif -ifeq ($(ADK_TARGET_WITH_MMU),) -ADK_SUFFIX:= $(ADK_SUFFIX)_nommu +ifneq ($(ADK_TARGET_FLOAT),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_FLOAT) +endif +ifneq ($(ADK_TARGET_ABI),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_ABI) endif # some global dirs @@ -126,14 +129,9 @@ endif # for architectures where gcc --with-cpu matches -mcpu= ifneq ($(ADK_TARGET_GCC_CPU),) -ifeq ($(ADK_CPU_ARC700),y) -TARGET_CFLAGS+= -mcpu=ARC700 -TARGET_CXXFLAGS+= -mcpu=ARC700 -else TARGET_CFLAGS+= -mcpu=$(ADK_TARGET_GCC_CPU) TARGET_CXXFLAGS+= -mcpu=$(ADK_TARGET_GCC_CPU) endif -endif # for archiectures where gcc --with-arch matches -march= ifneq ($(ADK_TARGET_GCC_ARCH),) diff --git a/package/Config.in.options b/package/Config.in.options new file mode 100644 index 000000000..a806da895 --- /dev/null +++ b/package/Config.in.options @@ -0,0 +1,72 @@ +config ADK_PACKAGE_SUFFIX + string + default "ipk" if ADK_TARGET_PACKAGE_IPKG + default "ipk" if ADK_TARGET_PACKAGE_OPKG + default "tar.xz" if ADK_TARGET_PACKAGE_TXZ + +choice +prompt "Package format" +default ADK_TARGET_PACKAGE_TXZ + +config ADK_TARGET_PACKAGE_TXZ + bool "xz compressed tar archive" + help + Create compressed tar archives of packages. + Pre- and post install scripts will be executed in the target + directory. There will be no package manager installed onto the target. + +config ADK_TARGET_PACKAGE_IPKG + bool "ipkg" + select BUSYBOX_IPKG + help + Create ipkg packages and use ipkg package management on the target. + +config ADK_TARGET_PACKAGE_OPKG + bool "opkg" + select ADK_PACKAGE_OPKG + select ADK_HOST_NEED_OPKG + help + Create opkg packages and use opkg package management on the target. + +endchoice +config ADK_LEAVE_ETC_ALONE + bool "do not install anything into /etc" + default n + help + Enabling this option will prevent the ADK from installing anything + into /etc. This is useful for highly customised setups with custom + base-files packages. + + Package Makefiles can override this setting by passing "force_etc" to + the package-template. to a non-empty value. This is useful for + packages traditionally installing non-config stuff into /etc, like + e.g. ca-certificates. + + Note that without further customisation, turning this option + on will almost certainly render the resulting system unusable. + +config ADK_INSTALL_PACKAGE_INIT_SCRIPTS + bool "ship custom init-scripts along with packages" + default y + depends on !ADK_LEAVE_ETC_ALONE + help + Turning this option to false will prevent the ADK from + installing init-scripts (i.e. files in /etc/init.d) for + certain daemons and daemon-like applications. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + +config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS + bool "ship custom network-scripts along with packages" + default y + depends on !ADK_LEAVE_ETC_ALONE + help + Turning this option to false will prevent the ADK from + installing network-scripts (i.e. files in /etc/network/) for + packages providing any. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + + diff --git a/package/boost/Makefile b/package/boost/Makefile index dd08b0f34..8fee53109 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -107,10 +107,10 @@ endif ifeq ($(ADK_TARGET_ARCH),ppc) BOOST_ARCH:= power endif -ifeq ($(ADK_CPU_MIPS32),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y) BOOST_ARCH:= mips32 endif -ifeq ($(ADK_CPU_MIPS32R2),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32R2),y) BOOST_ARCH:= mips32r2 endif diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index f3f69ab26..f91bf3347 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -154,11 +154,10 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIGURE_CPU_OPTS:= --enable-armv6 endif -ifeq ($(ADK_CPU_MIPS32),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y) CONFIGURE_CPU_OPTS+= --disable-mipsdspr1 --disable-mipsdspr2 endif - CONFIG_STYLE:= minimal CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 6624394ef..8a0eabff3 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -69,9 +69,6 @@ PKGFS_WITH_LIRC:= lirc PKGFD_WITH_WEBSERVER:= enable internal webserver support PKG_BUILDDEP_SOLIDRUN_IMX6:= gpu-viv-bin-mx6q - -# freescale GL libraries linked against glibc -PKG_LIBC_DEPENDS:= glibc uclibc-ng PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6 DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \ diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 9926ed960..36f7ae6f2 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -26,10 +26,10 @@ INSTALL_STYLE:= manual libgcc-install: $(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) ifeq ($(ADK_TARGET_ARCH_SH),y) -ifeq ($(ADK_CPU_SH3),y) +ifeq ($(ADK_TARGET_CPU_SH_SH3),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m3*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif -ifeq ($(ADK_CPU_SH4),y) +ifeq ($(ADK_TARGET_CPU_SH_SH4),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m4*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif else diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 18b56e847..3b2fa5ec4 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(ADK_TARGET_ARCH_MIPS),y) CONFIGURE_ARGS+= --target=mips32-linux-gcc endif -ifeq ($(ADK_CPU_LOONGSON2F),y) +ifeq ($(ADK_TARGET_CPU_MIPS64_LOONGSON2F),y) CONFIGURE_ARGS+= --target=loongson2f-linux-gcc endif ifeq ($(ADK_TARGET_ARCH_MIPS64),y) diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index 7629c9a86..28d9b74ca 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -23,10 +23,10 @@ $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP AUTOTOOL_STYLE:= autoreconf -ifeq ($(ADK_CPU_I486),y) +ifeq ($(ADK_TARGET_CPU_X86_I486),y) CONFIGURE_ARGS+= --with-cpu=i486 endif -ifeq ($(ADK_CPU_I586),y) +ifeq ($(ADK_TARGET_CPU_X86_I586),y) CONFIGURE_ARGS+= --with-cpu=i586 endif ifeq ($(ADK_TARGET_CPU_WITH_NEON),y) diff --git a/rules.mk b/rules.mk index a734408f8..29d147149 100644 --- a/rules.mk +++ b/rules.mk @@ -25,7 +25,6 @@ SET_DASHX:= : endif # Strip off the annoying quoting -ADK_APPLIANCE_VERSION:= $(strip $(subst ",, $(ADK_APPLIANCE_VERSION))) ADK_TARGET_ARCH:= $(strip $(subst ",, $(ADK_TARGET_ARCH))) ADK_TARGET_SYSTEM:= $(strip $(subst ",, $(ADK_TARGET_SYSTEM))) ADK_TARGET_BOARD:= $(strip $(subst ",, $(ADK_TARGET_BOARD))) @@ -35,6 +34,7 @@ ADK_TARGET_KERNEL:= $(strip $(subst ",, $(ADK_TARGET_KERNEL))) ADK_TARGET_LIBC:= $(strip $(subst ",, $(ADK_TARGET_LIBC))) ADK_TARGET_LIBC_PATH:= $(strip $(subst ",, $(ADK_TARGET_LIBC_PATH))) ADK_TARGET_ENDIAN:= $(strip $(subst ",, $(ADK_TARGET_ENDIAN))) +ADK_TARGET_ENDIAN_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_ENDIAN_SUFFIX))) ADK_TARGET_GCC_CPU:= $(strip $(subst ",, $(ADK_TARGET_GCC_CPU))) ADK_TARGET_GCC_ARCH:= $(strip $(subst ",, $(ADK_TARGET_GCC_ARCH))) ADK_TARGET_FLOAT:= $(strip $(subst ",, $(ADK_TARGET_FLOAT))) @@ -46,7 +46,6 @@ ADK_TARGET_CFLAGS_OPT:= $(strip $(subst ",, $(ADK_TARGET_CFLAGS_OPT))) ADK_TARGET_ABI_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS))) ADK_TARGET_ABI:= $(strip $(subst ",, $(ADK_TARGET_ABI))) ADK_TARGET_MIPS_ABI:= $(strip $(subst ",, $(ADK_TARGET_MIPS_ABI))) -ADK_TARGET_XTENSA:= $(strip $(subst ",, $(ADK_TARGET_XTENSA))) ADK_TARGET_IP:= $(strip $(subst ",, $(ADK_TARGET_IP))) ADK_TARGET_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_SUFFIX))) ADK_TARGET_CMDLINE:= $(strip $(subst ",, $(ADK_TARGET_CMDLINE))) diff --git a/scripts/create-menu b/scripts/create-menu index 3624776e7..e0552d44b 100755 --- a/scripts/create-menu +++ b/scripts/create-menu @@ -11,20 +11,13 @@ printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.sys printf "source target/config/Config.in.system.default\n" >> target/config/Config.in.system printf "source target/config/Config.in.system.choice\n" >> target/config/Config.in.system -# update appliances -if [ -d "$topdir/target/appliances" ];then - printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.appliances - printf "choice\n" >> $topdir/target/config/Config.in.appliances - printf "prompt \"Appliance\"\n\n" >> $topdir/target/config/Config.in.appliances - printf "config ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances - printf "\tprompt \"choose an appliance\"\n" >> $topdir/target/config/Config.in.appliances - printf "\tbool\n\n" >> $topdir/target/config/Config.in.appliances - cat $topdir/target/appliances/*.appliance >> $topdir/target/config/Config.in.appliances 2>/dev/null - printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.appliances - printf "menu \"Appliance Options\"\n" >> $topdir/target/config/Config.in.appliances - printf "\tvisible if !ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances - cat $topdir/target/appliances/*.options >> $topdir/target/config/Config.in.appliances 2>/dev/null - printf "endmenu\n" >> $topdir/target/config/Config.in.appliances +# update tasks +if [ -d "$topdir/tasks" ];then + printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.tasks + printf "choice\n" >> $topdir/target/config/Config.in.tasks + printf "prompt \"Task\"\n\n" >> $topdir/target/config/Config.in.tasks + cat $topdir/tasks/* >> $topdir/target/config/Config.in.tasks 2>/dev/null + printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.tasks fi # create system default @@ -43,9 +36,19 @@ for i in $systems;do done # create or update systems +for arch in $(cat $topdir/target/arch.lst);do + ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]') + printf "config ADK_TARGET_SYSTEM_GENERIC_$ARCH\n" > $topdir/target/$arch/Config.in.systems + printf "\tbool \"Generic\"\n" >> $topdir/target/$arch/Config.in.systems + printf "\tselect ADK_TARGET_GENERIC\n" >> $topdir/target/$arch/Config.in.systems + printf "\thelp\n" >> $topdir/target/$arch/Config.in.systems + printf "\t Generic $ARCH system.\n\n" >> $topdir/target/$arch/Config.in.systems + printf "\tdefault \"generic-${arch}\" if ADK_TARGET_SYSTEM_GENERIC_$ARCH\n" >> $topdir/target/config/Config.in.system.default +done + for i in $(ls $topdir/target/);do if [ -d "$topdir/target/$i/systems" ];then - cat $topdir/target/$i/systems/* > $topdir/target/$i/Config.in.systems 2>/dev/null + cat $topdir/target/$i/systems/* >> $topdir/target/$i/Config.in.systems 2>/dev/null fi done @@ -55,7 +58,7 @@ printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arc for arch in $(cat $topdir/target/arch.lst);do ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]') printf "choice\n" > $topdir/target/$arch/Config.in.arch - printf "prompt \"Embedded system\"\n" >> $topdir/target/$arch/Config.in.arch + printf "prompt \"System\"\n" >> $topdir/target/$arch/Config.in.arch printf "depends on ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/$arch/Config.in.arch printf "source target/$arch/Config.in.systems\n" >> $topdir/target/$arch/Config.in.arch printf "endchoice\n" >> $topdir/target/$arch/Config.in.arch @@ -82,7 +85,15 @@ EOD for arch in $(cat $topdir/target/arch.lst);do ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]') printf "config ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice - printf "\tbool \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice + printf "\tbool \"$arch\"\n" >> $topdir/target/config/Config.in.arch.choice + case $arch in + alpha|ia64|sh|sparc64|s390|tile|ppc64|mips64|x86_64) + printf "\tdepends on ADK_TARGET_OS_LINUX\n" >> $topdir/target/config/Config.in.arch.choice + ;; + nds32|moxie|v850) + printf "\tdepends on ADK_TARGET_OS_BAREMETAL\n" >> $topdir/target/config/Config.in.arch.choice + ;; + esac printf "\thelp\n" >> $topdir/target/config/Config.in.arch.choice printf "\t Support for $ARCH systems.\n\n" >> $topdir/target/config/Config.in.arch.choice done diff --git a/target/aarch64/kernel/generic-aarch64 b/target/aarch64/kernel/generic-aarch64 new file mode 100644 index 000000000..e40393f9a --- /dev/null +++ b/target/aarch64/kernel/generic-aarch64 @@ -0,0 +1 @@ +CONFIG_ARM64=y diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm index fea3ada10..d76fbc1cf 100644 --- a/target/aarch64/systems/arm-fm +++ b/target/aarch64/systems/arm-fm @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ARM_FM bool "ARMv8 Foundation Model" - select ADK_CPU_CORTEX_A57 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A57 select ADK_TARGET_KERNEL_IMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION select ADK_PACKAGE_BOOT_WRAPPER_AARCH64 diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64 index e649aad11..daf8a359b 100644 --- a/target/aarch64/systems/qemu-aarch64 +++ b/target/aarch64/systems/qemu-aarch64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_AARCH64 bool "Qemu Emulator" - select ADK_CPU_CORTEX_A57 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A57 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_IMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64 deleted file mode 100644 index 8f490dd5a..000000000 --- a/target/aarch64/systems/toolchain-aarch64 +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64 - bool "Toolchain only" - select ADK_CPU_CORTEX_A57 - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - AARCH64 toolchain. - diff --git a/target/alpha/kernel/generic-alpha b/target/alpha/kernel/generic-alpha new file mode 100644 index 000000000..3e1cf8337 --- /dev/null +++ b/target/alpha/kernel/generic-alpha @@ -0,0 +1 @@ +CONFIG_ALPHA=y diff --git a/target/alpha/systems/qemu-alpha b/target/alpha/systems/qemu-alpha index 7dd387817..59bdbc9f0 100644 --- a/target/alpha/systems/qemu-alpha +++ b/target/alpha/systems/qemu-alpha @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_QEMU_ALPHA bool "Qemu Emulator" - select ADK_CPU_ALPHA + select ADK_TARGET_CPU_ALPHA select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_WITH_COMPRESSION help diff --git a/target/alpha/systems/toolchain-alpha b/target/alpha/systems/toolchain-alpha deleted file mode 100644 index efa21c747..000000000 --- a/target/alpha/systems/toolchain-alpha +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ALPHA - bool "Toolchain only" - select ADK_CPU_ALPHA - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - ALPHA toolchain. - diff --git a/target/appliances/000default.appliance b/target/appliances/000default.appliance deleted file mode 100644 index 5ebe90e7e..000000000 --- a/target/appliances/000default.appliance +++ /dev/null @@ -1,5 +0,0 @@ -config ADK_APPLIANCE_NEW - bool "create a new appliance" - help - Create a new appliance from scratch. - diff --git a/target/appliances/default.options b/target/appliances/default.options deleted file mode 100644 index bf6ca0e25..000000000 --- a/target/appliances/default.options +++ /dev/null @@ -1,5 +0,0 @@ -config ADK_APPLIANCE_VERSION - prompt "version string" - string - help - Configure version for appliance diff --git a/target/appliances/development.appliance b/target/appliances/development.appliance deleted file mode 100644 index 760b68801..000000000 --- a/target/appliances/development.appliance +++ /dev/null @@ -1,24 +0,0 @@ -config ADK_APPLIANCE_DEVELOPMENT - bool "development appliance" - select ADK_PACKAGE_GCC - select ADK_PACKAGE_GXX - select ADK_PACKAGE_BINUTILS - select ADK_PACKAGE_MAKE - select ADK_PACKAGE_GDB - select ADK_PACKAGE_BISON - select ADK_PACKAGE_FLEX - select ADK_PACKAGE_PKGCONF - select ADK_PACKAGE_AUTOCONF - select ADK_PACKAGE_AUTOMAKE - select ADK_PACKAGE_LIBTOOL - select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL - select ADK_PACKAGE_UCLIBC_NG_DEV if ADK_TARGET_LIB_UCLIBC_NG - select ADK_PACKAGE_GIT - select ADK_PACKAGE_OPENSSH - select ADK_PACKAGE_OPENSSH_CLIENT - select ADK_PACKAGE_WGET - help - If you want to develop software on your target, choose this - appliance, so gcc, binutils and co will be selected. - diff --git a/target/appliances/firefox.appliance b/target/appliances/firefox.appliance deleted file mode 100644 index 08f5d8876..000000000 --- a/target/appliances/firefox.appliance +++ /dev/null @@ -1,28 +0,0 @@ -config ADK_APPLIANCE_FIREFOX - bool "firefox kiosk appliance" - select ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_GLIBC - select ADK_PACKAGE_FIREFOX - select ADK_PACKAGE_XORG_SERVER - select ADK_PACKAGE_FONT_MISC_MISC - select ADK_PACKAGE_XINIT - select ADK_PACKAGE_KBD - select ADK_PACKAGE_DROPBEAR - select ADK_PACKAGE_DROPBEAR_WITH_UTMP - select ADK_PACKAGE_E2FSCK - select ADK_PACKAGE_XDOTOOL - select BUSYBOX_NTPD - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_DROPBEAR - select ADK_RUNTIME_START_BUSYBOX_NTPD - select ADK_RUNTIME_START_BUSYBOX_SYSLOGD - select ADK_RUNTIME_START_FIREFOX - select ADK_RUNTIME_START_KBD - select ADK_KERNEL_INPUT_EVDEV m - select ADK_KERNEL_USB_HID m - select ADK_TARGET_USB_KEYBOARD - select ADK_TARGET_USB_MOUSE - select ADK_RUNTIME_HOSTNAME firefoxbox - help - Create a small firefox kiosk appliance. - diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance deleted file mode 100644 index 041ccddf8..000000000 --- a/target/appliances/kodi.appliance +++ /dev/null @@ -1,37 +0,0 @@ -config ADK_APPLIANCE_KODI - bool "kodi multimedia appliance" - select ADK_TARGET_LIB_GLIBC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_PACKAGE_GLIBC if ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_GLIBC_GCONV if ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_LIBICONV if ADK_TARGET_LIB_UCLIBC_NG - select ADK_TARGET_LIBICONV if ADK_TARGET_LIB_UCLIBC_NG - select ADK_PACKAGE_KODI - select ADK_PACKAGE_PYTHON2_MOD_ZLIB # required for YouTube Addon - select ADK_PACKAGE_PYTHON2_MOD_SSL # required for YouTube Addon - select ADK_PACKAGE_PYTHON2_MOD_EXPAT # required for Mediathek Addon - select ADK_PACKAGE_CURL - select ADK_PACKAGE_CURL_WITH_LIBRESSL - select ADK_PACKAGE_DROPBEAR - select ADK_PACKAGE_DROPBEAR_WITH_UTMP - select ADK_PACKAGE_E2FSCK - select BUSYBOX_NTPD - select BUSYBOX_WATCHDOG - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_DROPBEAR - select ADK_RUNTIME_START_BUSYBOX_NTPD - select ADK_RUNTIME_START_BUSYBOX_SYSLOGD - select ADK_RUNTIME_START_BUSYBOX_WATCHDOG - select ADK_RUNTIME_START_KODI m - select ADK_KERNEL_INPUT_EVDEV m - select ADK_KERNEL_USB_HID m - select ADK_TARGET_USB_KEYBOARD - select ADK_TARGET_USB_MOUSE - select ADK_RUNTIME_HOSTNAME kodibox - select ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA if ADK_TARGET_BOARD_BCM28XX - select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_BOARD_BCM28XX - select ADK_PACKAGE_BCM28XX_VC_GL_LIBS if ADK_TARGET_BOARD_BCM28XX - select ADK_KERNEL_PREEMPT__LL # for better performance and no sound problems - help - Create a small kodi multimedia appliance. Please enable additional features - in Package/Multimedia - diff --git a/target/appliances/mpd.appliance b/target/appliances/mpd.appliance deleted file mode 100644 index 1be44db3a..000000000 --- a/target/appliances/mpd.appliance +++ /dev/null @@ -1,47 +0,0 @@ -config ADK_APPLIANCE_MPD - bool "music player daemon appliance" - select ADK_PACKAGE_MPD - select ADK_PACKAGE_MPD_WITH_ALSA - select ADK_PACKAGE_MPD_WITH_MP3 - select ADK_PACKAGE_MPD_WITH_MP4 - select ADK_PACKAGE_MPD_WITH_OGG - select ADK_PACKAGE_MPD_WITH_OPUS - select ADK_PACKAGE_MPD_WITH_FLAC - select ADK_PACKAGE_MPD_WITH_WAV - select ADK_PACKAGE_MPD_WITH_MMS - select ADK_PACKAGE_MPD_WITH_FFMPEG - select ADK_PACKAGE_MPD_WITH_SHOUT - select ADK_PACKAGE_MPD_WITH_CURL - select ADK_PACKAGE_MPD_WITH_SAMPLERATE - select ADK_PACKAGE_MPD_WITH_SNDFILE - select ADK_PACKAGE_MPD_WITH_HTTPD - select ADK_PACKAGE_CIFS_UTILS - select ADK_PACKAGE_LIBMPDCLIENT - select ADK_PACKAGE_MPC - select ADK_PACKAGE_DROPBEAR - select ADK_PACKAGE_DROPBEAR_WITH_UTMP - select ADK_PACKAGE_FFPROBE - select ADK_PACKAGE_LIBFFMPEG - select ADK_PACKAGE_LIBFFMPEG_WITH_AAC - select ADK_PACKAGE_LIBFFMPEG_WITH_MP3 - select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS - select ADK_PACKAGE_E2FSCK - select ADK_PACKAGE_ALSA_UTILS - select BUSYBOX_NTPD - select BUSYBOX_WATCHDOG - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_DROPBEAR - select ADK_RUNTIME_START_BUSYBOX_NTPD - select ADK_RUNTIME_START_BUSYBOX_SYSLOGD - select ADK_RUNTIME_START_MPD - select ADK_KERNEL_USB_HID - select ADK_TARGET_USB_KEYBOARD - select ADK_TARGET_USB_MOUSE - select ADK_KERNEL_INPUT_KEYBOARD - select ADK_KERNEL_INPUT_MOUSE - select ADK_KERNEL_INPUT_EVDEV - select ADK_RUNTIME_HOSTNAME mpdbox - select ADK_KERNEL_USB_STORAGE m - help - Create a small music player daemon appliance. - diff --git a/target/appliances/mpd.options b/target/appliances/mpd.options deleted file mode 100644 index 9d19f2e5b..000000000 --- a/target/appliances/mpd.options +++ /dev/null @@ -1,17 +0,0 @@ -choice -prompt "Choose a GUI" -depends on ADK_APPLIANCE_MPD - -config ADK_APPLIANCE_MPD_MPDBOX - bool "use mpdbox html/javascript frontend" - select ADK_PACKAGE_MPDBOX - -config ADK_APPLIANCE_MPD_YMPD - bool "use ympd frontend" - select ADK_PACKAGE_YMPD - select ADK_RUNTIME_START_YMPD - -config ADK_APPLIANCE_MPD_NOGUI - bool "use no gui frontend" - -endchoice diff --git a/target/appliances/test.appliance b/target/appliances/test.appliance deleted file mode 100644 index 57b156acd..000000000 --- a/target/appliances/test.appliance +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_APPLIANCE_TEST - bool "automatic test system appliance" - select ADK_PACKAGE_ADKTEST - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_ADKTEST - help - Create a small appliance for automatic testing. - diff --git a/target/arc/kernel/generic-arc b/target/arc/kernel/generic-arc new file mode 100644 index 000000000..094fe8e9e --- /dev/null +++ b/target/arc/kernel/generic-arc @@ -0,0 +1 @@ +CONFIG_ARC=y diff --git a/target/arc/systems/nsim-arcv1 b/target/arc/systems/nsim-arcv1 index 1f0dc7dcd..65706b24f 100644 --- a/target/arc/systems/nsim-arcv1 +++ b/target/arc/systems/nsim-arcv1 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_NSIM_ARCV1 bool "Synopsys NSIM Emulator (ARCv1)" - select ADK_CPU_ARC700 + select ADK_TARGET_CPU_ARC_ARC700 select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_SERIAL select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arc/systems/nsim-arcv2 b/target/arc/systems/nsim-arcv2 index 949acfbf6..c56b16c3a 100644 --- a/target/arc/systems/nsim-arcv2 +++ b/target/arc/systems/nsim-arcv2 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_NSIM_ARCV2 bool "Synopsys NSIM Emulator (ARCv2)" - select ADK_CPU_ARC_HS + select ADK_TARGET_CPU_ARC_ARC_HS select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_SERIAL select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arc/systems/toolchain-arc b/target/arc/systems/toolchain-arc deleted file mode 100644 index 15e5b58fc..000000000 --- a/target/arc/systems/toolchain-arc +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ARC - bool "Toolchain only" - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - ARC toolchain. - diff --git a/target/arm/kernel/generic-arm b/target/arm/kernel/generic-arm new file mode 100644 index 000000000..a2666cde3 --- /dev/null +++ b/target/arm/kernel/generic-arm @@ -0,0 +1 @@ +CONFIG_ARM=y diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index 50cdd6d80..e5bcc2b1c 100644 --- a/target/arm/systems/banana-pro +++ b/target/arm/systems/banana-pro @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BANANA_PRO bool "Banana Pro" - select ADK_CPU_CORTEX_A7 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index 25ef8ee6f..736975ae0 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK bool "BeagleBone Black" - select ADK_TARGET_LITTLE_ENDIAN - select ADK_CPU_CORTEX_A8 + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index a54fc3afd..66eedf140 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 bool "Kinetis K70" depends on ADK_EXPERIMENTAL - select ADK_CPU_CORTEX_M3 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_NETDEVICE diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index ee7da28e5..c54356aa9 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 bool "Linksys NSLU2" depends on ADK_EXPERIMENTAL - select ADK_CPU_XSCALE - select ADK_TARGET_BIG_ENDIAN + depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/qemu-arm-realview-eb-mpcore b/target/arm/systems/qemu-arm-realview-eb-mpcore index f8de055a8..5a65aca72 100644 --- a/target/arm/systems/qemu-arm-realview-eb-mpcore +++ b/target/arm/systems/qemu-arm-realview-eb-mpcore @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE bool "Qemu Emulator (Realview/EB-Mpcore)" - select ADK_CPU_ARM11MPCORE - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_ARM11MPCORE select ADK_TARGET_QEMU select ADK_TARGET_WITH_SMP select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz index 45d2cf0ed..a695065e6 100644 --- a/target/arm/systems/qemu-arm-spitz +++ b/target/arm/systems/qemu-arm-spitz @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ bool "Qemu Emulator (Spitz PDA)" - select ADK_CPU_XSCALE - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier index 46808c09b..f6dbd6b6b 100644 --- a/target/arm/systems/qemu-arm-terrier +++ b/target/arm/systems/qemu-arm-terrier @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER bool "Qemu Emulator (Terrier PDA)" - select ADK_CPU_XSCALE - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb index 94ae74d17..2ab7f712f 100644 --- a/target/arm/systems/qemu-arm-versatilepb +++ b/target/arm/systems/qemu-arm-versatilepb @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB bool "Qemu Emulator (Versatile/PB)" - select ADK_CPU_ARM926EJ_S - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_ARM926EJ_S select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9 index bfa22e068..faff5f31b 100644 --- a/target/arm/systems/qemu-arm-vexpress-a9 +++ b/target/arm/systems/qemu-arm-vexpress-a9 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 bool "Qemu Emulator (Vexpress A9)" - select ADK_CPU_CORTEX_A9 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index f1a89aebd..233dc15e8 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" - select ADK_CPU_ARM1176JZF_S - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 356e48a03..c080347c0 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" - select ADK_CPU_CORTEX_A7 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index ec3ff58a9..f30c4922f 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS bool "Sharp Zaurus CL3200 (Terrier)" - select ADK_CPU_XSCALE - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index 42166edb0..cb1c630da 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 bool "Solidrun IMX6 Embedded Systems" - select ADK_CPU_CORTEX_A9 - select ADK_TARGET_LITTLE_ENDIAN + depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCI diff --git a/target/arm/systems/toolchain-arm b/target/arm/systems/toolchain-arm deleted file mode 100644 index 268daed0d..000000000 --- a/target/arm/systems/toolchain-arm +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM - bool "Toolchain only" - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - ARM toolchain. - diff --git a/target/avr32/kernel/generic-avr32 b/target/avr32/kernel/generic-avr32 new file mode 100644 index 000000000..592bedbd7 --- /dev/null +++ b/target/avr32/kernel/generic-avr32 @@ -0,0 +1 @@ +CONFIG_AVR32=y diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 index 074472aa4..3c5808d90 100644 --- a/target/avr32/systems/atmel-ngw100 +++ b/target/avr32/systems/atmel-ngw100 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100 bool "Atmel NGW100" - select ADK_CPU_AVR32 + select ADK_TARGET_CPU_AVR32 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET diff --git a/target/avr32/systems/toolchain-avr32 b/target/avr32/systems/toolchain-avr32 deleted file mode 100644 index 76df7491c..000000000 --- a/target/avr32/systems/toolchain-avr32 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_AVR32 - bool "Toolchain only" - select ADK_CPU_AVR32 - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - AVR32 toolchain. - diff --git a/target/bfin/kernel/generic-bfin b/target/bfin/kernel/generic-bfin new file mode 100644 index 000000000..864f18f30 --- /dev/null +++ b/target/bfin/kernel/generic-bfin @@ -0,0 +1 @@ +CONFIG_BLACKFIN=y diff --git a/target/bfin/systems/sim-bfin b/target/bfin/systems/sim-bfin index 6b1902283..619d5e1ec 100644 --- a/target/bfin/systems/sim-bfin +++ b/target/bfin/systems/sim-bfin @@ -1,6 +1,5 @@ config ADK_TARGET_SYSTEM_SIM_BFIN bool "GDB simulator" - select ADK_CPU_BFIN select ADK_TARGET_SIM select ADK_TARGET_PACKAGE_TXZ help diff --git a/target/bfin/systems/toolchain-bfin b/target/bfin/systems/toolchain-bfin deleted file mode 100644 index 64f8b2c46..000000000 --- a/target/bfin/systems/toolchain-bfin +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_BFIN - bool "Toolchain only" - select ADK_CPU_BFIN - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - BFIN toolchain. - diff --git a/target/c6x/systems/toolchain-c6x b/target/c6x/systems/toolchain-c6x deleted file mode 100644 index 78093e92d..000000000 --- a/target/c6x/systems/toolchain-c6x +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_C6X - bool "Toolchain only" - select ADK_CPU_C6X - select ADK_TARGET_UCLINUX - select ADK_TARGET_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - C6X toolchain. - diff --git a/target/config/Config.in b/target/config/Config.in index 5e6680d2d..c584b9e55 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -8,10 +8,7 @@ config ADK_LINUX_64 config ADK_TARGET_KERNEL_64 bool -config ADK_TOOLCHAIN_ONLY - bool - -config ADK_TARGET_TOOLCHAIN +config ADK_TARGET_GENERIC bool config ADK_TARGET_UCLINUX @@ -32,12 +29,6 @@ config ADK_TARGET_VBOX select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE -config ADK_TARGET_ARCH_ARM_WITH_THUMB - bool - select ADK_KERNEL_ARM_THUMB - 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.adk b/target/config/Config.in.adk index 81144dc02..a70752bab 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -1,17 +1,16 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -menu "Global ADK settings" - visible if !ADK_CHOOSE_APPLIANCE +menu "Global settings" config ADK_HOST string "webserver for packages and distfiles" default "openadk.org" help - Configure host for IPKG package management. + Configure host for package management and backup server for distfiles. config ADK_DL_DIR - string "download directory for packages" + string "download directory for source packages" default "" help Configure the download directory for all source packages. @@ -30,7 +29,7 @@ config ADK_BUILD_WITH_DEBUG default n help If you want to create debug packages, you should enable this option. - WARNING: It will use a lot of aditional disk space on you build system! + WARNING: It will use a lot of additional disk space on you build system! config ADK_DISABLE_HONOUR_CFLAGS bool "Disable honour CFLAGS checks globally" @@ -46,6 +45,7 @@ config ADK_DISABLE_CHECKSUM config ADK_DISABLE_KERNEL_P