summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-02 15:12:07 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-02 15:13:35 (GMT)
commitc222886f38ea1185c1b420f03d1e1fb377506af0 (patch)
tree0ba5c36cb5d1ad37e8969dc96d47181234a175c0
parent48758993b09a96f83c2bd190a5586421c90428e7 (diff)
simplify adding new arch
Generate all data needed when adding a new arch or system. Recognize any changes in target/*/systems as reported as bug by Joerg.
-rw-r--r--.gitignore7
-rw-r--r--Config.in18
-rw-r--r--Makefile2
-rw-r--r--mk/build.mk46
-rw-r--r--mk/kernel-vars.mk2
-rwxr-xr-xscripts/create-menu109
-rwxr-xr-xscripts/create-pkg6
-rwxr-xr-xscripts/create-sys30
-rw-r--r--target/aarch64/Config.in9
-rw-r--r--target/arm/Config.in9
-rw-r--r--target/config/Config.in.arch2
-rw-r--r--target/config/Config.in.arch.choice85
-rw-r--r--target/config/Config.in.arch.default59
-rw-r--r--target/config/Config.in.system2
-rw-r--r--target/config/Config.in.system.choice13
-rw-r--r--target/m68k/Config.in9
-rw-r--r--target/microblaze/Config.in9
-rw-r--r--target/mips/Config.in9
-rw-r--r--target/mips64/Config.in9
-rw-r--r--target/ppc/Config.in9
-rw-r--r--target/ppc64/Config.in9
-rw-r--r--target/sh/Config.in9
-rw-r--r--target/sparc/Config.in9
-rw-r--r--target/sparc64/Config.in9
-rw-r--r--target/x86/Config.in9
-rw-r--r--target/x86_64/Config.in9
26 files changed, 135 insertions, 363 deletions
diff --git a/.gitignore b/.gitignore
index acf4e2d..244b24f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
/.rebuild.*
/.defconfig
/.adkinit
+/.menu
/all.config
/target_*/
/host_*/
@@ -49,10 +50,10 @@
/package/Config.in.collections
/package/pkgconfigs.d/
/extra/
-/.menu
-/.adkinit
+/target/*/Config.in.arch
/target/*/Config.in.systems
-/target/config/Config.in.system.default
+/target/config/Config.in.system*
+/target/config/Config.in.arch*
/target/config/Config.in.scripts
/target/config/Config.in.prereq
/target/m68k/aranym.cfg
diff --git a/Config.in b/Config.in
index 1011119..22809cb 100644
--- a/Config.in
+++ b/Config.in
@@ -11,23 +11,7 @@ config ADK_HAVE_DOT_CONFIG
mainmenu "OpenADK Configuration"
-config ADK_CHOOSE_TARGET_SYSTEM
- boolean
- default y if ADK_CHOOSE_TARGET_SYSTEM_AARCH64
- default y if ADK_CHOOSE_TARGET_SYSTEM_ARM
- default y if ADK_CHOOSE_TARGET_SYSTEM_M68K
- default y if ADK_CHOOSE_TARGET_SYSTEM_MICROBLAZE
- default y if ADK_CHOOSE_TARGET_SYSTEM_MIPS
- default y if ADK_CHOOSE_TARGET_SYSTEM_MIPS64
- default y if ADK_CHOOSE_TARGET_SYSTEM_PPC
- default y if ADK_CHOOSE_TARGET_SYSTEM_PPC64
- default y if ADK_CHOOSE_TARGET_SYSTEM_SPARC
- default y if ADK_CHOOSE_TARGET_SYSTEM_SPARC64
- default y if ADK_CHOOSE_TARGET_SYSTEM_SH
- default y if ADK_CHOOSE_TARGET_SYSTEM_X86
- default y if ADK_CHOOSE_TARGET_SYSTEM_X86_64
- default n
-
+source "target/config/Config.in.system.choose"
source "target/config/Config.in.cpu"
source "target/config/Config.in.hardware"
source "target/config/Config.in.kernel"
diff --git a/Makefile b/Makefile
index a9d510e..d8400a0 100644
--- a/Makefile
+++ b/Makefile
@@ -210,8 +210,6 @@ NO_ERROR=0
CC='${CC}' CPPFLAGS='${CPPFLAGS}' \
bash scripts/scan-tools.sh
@echo '===> Prerequisites checked successfully.'
- @bash scripts/create-sys
- @bash scripts/create-pkg
@touch .adkinit
@touch $@
diff --git a/mk/build.mk b/mk/build.mk
index 6d355a0..6d15f57 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -143,13 +143,14 @@ include $(TOPDIR)/rules.mk
all: world
${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/depmaker
+ @echo "Generating dependencies ..."
$(TOPDIR)/adk/tools/depmaker > ${TOPDIR}/package/Depends.mk
.NOTPARALLEL:
.PHONY: all world clean cleandir cleantoolchain distclean image_clean
world:
- mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+ @mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
ifeq ($(ADK_TARGET_TOOLCHAIN),y)
@@ -169,9 +170,9 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
endif
${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
- mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
+ @mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
${STAGING_HOST_DIR}/{usr/bin,usr/lib,usr/include}
- for i in lib64 lib32 libx32;do \
+ @for i in lib64 lib32 libx32;do \
cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \
done
@@ -239,16 +240,16 @@ clean:
cleankernel:
@$(TRACE) cleankernel
- rm -rf $(TOOLCHAIN_BUILD_DIR)/w-linux* $(BUILD_DIR)/linux
+ @rm -rf $(TOOLCHAIN_BUILD_DIR)/w-linux* $(BUILD_DIR)/linux
cleandir:
@$(TRACE) cleandir
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
- rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) \
+ @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${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* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+ @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* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
distclean:
@$(TRACE) distclean
@@ -258,7 +259,8 @@ distclean:
@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX)
@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
- .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
+ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* \
+ ${TOPDIR}/target/*/Config.in.{arch*,system*} ${TOPDIR}/package/Config.in.auto*
else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
@@ -306,10 +308,6 @@ endif
ifneq (,$(filter CYGWIN%,${OStype}))
@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
endif
- @echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
- @echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
- @echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
- @echo 'source "target/config/Config.in.system.choice"' >> target/config/Config.in.system
@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
grep "^config" target/config/Config.in.arch.choice \
|grep -i "$(ADK_TARGET_ARCH)"\$$ \
@@ -370,10 +368,6 @@ endif
ifneq (,$(filter CYGWIN%,${OStype}))
@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
endif
- @echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
- @echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
- @echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
- @echo 'source "target/config/Config.in.system.choice"' >> target/config/Config.in.system
@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
grep "^config" target/config/Config.in.arch.choice \
|grep -i "$(ADK_TARGET_ARCH)"\$$ \
@@ -403,14 +397,14 @@ endif
>> $(TOPDIR)/all.config; \
fi
-menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto.global
+menuconfig: $(CONFIG)/mconf defconfig .menu
@if [ ! -f .config ];then \
$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
fi
@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
${POSTCONFIG}
-_config: $(CONFIG)/conf .menu package/Config.in.auto.global
+_config: $(CONFIG)/conf .menu
-@touch .config
@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
${POSTCONFIG}
@@ -427,15 +421,14 @@ distclean:
@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_TARGET_DIR_PFX)
@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
- .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
-
+ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG \
+ ${TOPDIR}/target/*/Config.in.{arch*,system*} ${TOPDIR}/package/Config.in.auto*
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) prereq
$(GMAKE) ADK_TARGET_ARCH=$(ADK_TARGET_ARCH) ADK_TARGET_SYSTEM=$(ADK_TARGET_SYSTEM) ADK_TARGET_LIBC=$(ADK_TARGET_LIBC) allmodconfig
$(GMAKE) VERBOSE=1 all 2>&1 | tee firmware/buildall.log
@@ -445,14 +438,15 @@ $(TOPDIR)/adk/tools/pkgmaker: $(TOPDIR)/adk/tools/pkgmaker.c $(TOPDIR)/adk/tools
$(TOPDIR)/adk/tools/pkgrebuild: $(TOPDIR)/adk/tools/pkgrebuild.c $(TOPDIR)/adk/tools/strmap.c
@$(CC_FOR_BUILD) -g -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
-package/Config.in.auto.global menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild
+$(TOPDIR)/adk/tools/depmaker: $(TOPDIR)/adk/tools/depmaker.c
+ $(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/adk/tools/depmaker.c
+
+menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild
@echo "Generating menu structure ..."
+ @$(BASH) $(TOPDIR)/scripts/create-menu
@$(TOPDIR)/adk/tools/pkgmaker
@:>.menu
-$(TOPDIR)/adk/tools/depmaker: $(TOPDIR)/adk/tools/depmaker.c
- $(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/adk/tools/depmaker.c
-
dep: $(TOPDIR)/adk/tools/depmaker
@echo "Generating dependencies ..."
@$(TOPDIR)/adk/tools/depmaker > ${TOPDIR}/package/Depends.mk
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index a9fd2aa..29202fe 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -2,7 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
KERNEL_MAKE_OPTS:= V=1 \
- ARCH=$(ADK_TARGET_ARCH) \
+ ARCH="$(ADK_TARGET_ARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
HOSTCC="${CC_FOR_BUILD}" \
diff --git a/scripts/create-menu b/scripts/create-menu
new file mode 100755
index 0000000..573daad
--- /dev/null
+++ b/scripts/create-menu
@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
+systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
+
+printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arch
+printf "source target/config/Config.in.arch.default\n" > target/config/Config.in.arch
+printf "source target/config/Config.in.arch.choice\n" >> target/config/Config.in.arch
+printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.system
+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 package collection
+if [ -d "$topdir/target/collections" ];then
+ printf "# autogenerated via scripts/create-menu\n" > $topdir/package/Config.in.collections
+ cat $topdir/target/collections/* >> $topdir/package/Config.in.collections 2>/dev/null
+fi
+
+# create system default
+printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.system.default
+for j in $systems;do
+ system=${j#ADK_TARGET_SYSTEM_}
+ systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
+ printf "config ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
+ printf "\tboolean\n\n" >> $topdir/target/config/Config.in.system.default
+done
+
+cat >> $topdir/target/config/Config.in.system.default << EOD
+config ADK_TARGET_SYSTEM
+ string
+EOD
+for i in $systems;do
+ system=${i#ADK_TARGET_SYSTEM_}
+ systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
+ system=$(echo $system|tr '[:upper:]_' '[:lower:]-')
+ system=$(echo $system|sed 's#x86-64#x86_64#')
+ printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
+done
+
+# create or update systems
+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
+ fi
+done
+
+# create target/$arch/Config.in.arch and target/config/Config.in.system.choice
+printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.system.choice
+printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arch.default
+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 "depends on ADK_LINUX_$ARCH && !ADK_CHOOSE_TARGET_ARCH\n" >> $topdir/target/$arch/Config.in.arch
+ printf "prompt \"Target system\"\n\n" >> $topdir/target/$arch/Config.in.arch
+ printf "config ADK_CHOOSE_TARGET_SYSTEM_$ARCH\n" >> $topdir/target/$arch/Config.in.arch
+ printf "\tboolean \"Choose target system\"\n\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
+ printf "source target/$arch/Config.in.arch\n" >> target/config/Config.in.system.choice
+ printf "config ADK_$arch\n" >> target/config/Config.in.arch.default
+ printf "\tboolean\n\n" >> target/config/Config.in.arch.default
+done
+
+cat >> $topdir/target/config/Config.in.arch.default << EOD
+config ADK_TARGET_ARCH
+ string
+EOD
+
+for arch in $(cat $topdir/target/arch.lst);do
+ printf "\tdefault \"$arch\" if ADK_$arch\n" >> target/config/Config.in.arch.default
+done
+
+cat > $topdir/target/config/Config.in.arch.choice << EOD
+# autogenerated via scripts/create-menu
+choice
+prompt "Target architecture"
+
+config ADK_CHOOSE_TARGET_ARCH
+ bool "Choose target architecture"
+
+EOD
+
+for arch in $(cat $topdir/target/arch.lst);do
+ ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
+ printf "config ADK_LINUX_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice
+ printf "\tprompt \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice
+ printf "\tboolean\n" >> $topdir/target/config/Config.in.arch.choice
+ printf "\tselect ADK_$arch\n" >> $topdir/target/config/Config.in.arch.choice
+ 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
+
+printf "endchoice\n" >> $topdir/target/config/Config.in.arch.choice
+
+cat > $topdir/target/config/Config.in.system.choose << EOD
+# autogenerated via scripts/create-menu
+config ADK_CHOOSE_TARGET_SYSTEM
+ boolean
+EOD
+
+for arch in $(cat $topdir/target/arch.lst);do
+ ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
+ printf "\tdefault y if ADK_CHOOSE_TARGET_SYSTEM_$ARCH\n" >> $topdir/target/config/Config.in.system.choose
+done
+printf "\tdefault n\n" >> $topdir/target/config/Config.in.system.choose
+
+exit 0
diff --git a/scripts/create-pkg b/scripts/create-pkg
deleted file mode 100755
index a41d379..0000000
--- a/scripts/create-pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-if [ -d "$topdir/target/collections" ];then
- cat $topdir/target/collections/* > $topdir/package/Config.in.collections 2>/dev/null
-fi
-exit 0
diff --git a/scripts/create-sys b/scripts/create-sys
deleted file mode 100755
index 3f2dc2c..0000000
--- a/scripts/create-sys
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
-
-echo '' > $topdir/target/config/Config.in.system.default
-for j in $systems;do
- system=${j#ADK_TARGET_SYSTEM_}
- systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
- printf "config ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
- printf "\tboolean\n\n" >> $topdir/target/config/Config.in.system.default
-done
-
-cat >> $topdir/target/config/Config.in.system.default << EOD
-config ADK_TARGET_SYSTEM
- string
-EOD
-for i in $systems;do
- system=${i#ADK_TARGET_SYSTEM_}
- systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
- system=$(echo $system|tr '[:upper:]_' '[:lower:]-')
- system=$(echo $system|sed 's#x86-64#x86_64#')
- printf "\tdefault \"${system}\" if ADK_$systemu\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
- fi
-done
-exit 0
diff --git a/target/aarch64/Config.in b/target/aarch64/Config.in
deleted file mode 100644
index 9e48de6..0000000
--- a/target/aarch64/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_AARCH64 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_AARCH64
- boolean "Choose target system"
-
-source "target/aarch64/Config.in.systems"
-endchoice
diff --git a/target/arm/Config.in b/target/arm/Config.in
deleted file mode 100644
index bd1b5c2..0000000
--- a/target/arm/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_ARM && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_ARM
- boolean "Choose target system"
-
-source "target/arm/Config.in.systems"
-endchoice
diff --git a/target/config/Config.in.arch b/target/config/Config.in.arch
deleted file mode 100644
index 83a4c07..0000000
--- a/target/config/Config.in.arch
+++ /dev/null
@@ -1,2 +0,0 @@
-source "target/config/Config.in.arch.default"
-source "target/config/Config.in.arch.choice"
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
deleted file mode 100644
index 517d6a0..0000000
--- a/target/config/Config.in.arch.choice
+++ /dev/null
@@ -1,85 +0,0 @@
-choice
-prompt "Target architecture"
-
-config ADK_CHOOSE_TARGET_ARCH
- bool "Choose target architecture"
-
-config ADK_LINUX_AARCH64
- bool "aarch64 system"
- select ADK_aarch64
- help
- Support for AARCH64 systems.
-
-config ADK_LINUX_ARM
- bool "arm system"
- select ADK_arm
- help
- Support for ARM systems.
-
-config ADK_LINUX_M68K
- bool "m68k system"
- select ADK_m68k
- help
- Support for m68k systems.
-
-config ADK_LINUX_MICROBLAZE
- bool "microblaze system"
- select ADK_microblaze
- help
- Support for Microblaze systems.
-
-config ADK_LINUX_MIPS
- bool "mips system"
- select ADK_mips
- help
- Support for MIPS systems.
-
-config ADK_LINUX_MIPS64
- bool "mips64 system"
- select ADK_mips64
- help
- Support for MIPS64 systems.
-
-config ADK_LINUX_PPC
- bool "ppc system"
- select ADK_ppc
- help
- Support for PPC systems.
-
-config ADK_LINUX_PPC64
- bool "ppc64 system"
- select ADK_ppc64
- help
- Support for PPC64 systems.
-
-config ADK_LINUX_SPARC
- bool "sparc system"
- select ADK_sparc
- help
- Support for SPARC systems.
-
-config ADK_LINUX_SPARC64
- bool "sparc64 system"
- select ADK_sparc64
- help
- Support for SPARC64 systems.
-
-config ADK_LINUX_SH
- bool "superh system"
- select ADK_sh
- help
- Support for superh systems.
-
-config ADK_LINUX_X86
- bool "x86 system"
- select ADK_x86
- help
- Support for x86 systems.
-
-config ADK_LINUX_X86_64
- bool "x86_64 system"
- select ADK_x86_64
- help
- Support for x86_64/amd64 systems.
-
-endchoice
diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default
deleted file mode 100644
index 2b8abc7..0000000
--- a/target/config/Config.in.arch.default
+++ /dev/null
@@ -1,59 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-# target architectures
-config ADK_aarch64
- bool
-
-config ADK_arm
- bool
-
-config ADK_m68k
- bool
-
-config ADK_microblaze
- bool
-
-config ADK_mips
- bool
-
-config ADK_mips64
- bool
-
-config ADK_ppc
- bool
-
-config ADK_ppc64
- bool
-
-config ADK_sparc
- bool
-
-config ADK_sparc64
- bool
-
-config ADK_sh
- bool
-
-config ADK_x86_64
- bool
-
-config ADK_x86
- bool
-
-config ADK_TARGET_ARCH
- string
- default "aarch64" if ADK_aarch64
- default "arm" if ADK_arm
- default "m68k" if ADK_m68k
- default "microblaze" if ADK_microblaze
- default "mips" if ADK_mips
- default "mips64" if ADK_mips64
- default "ppc" if ADK_ppc
- default "ppc64" if ADK_ppc64
- default "sparc" if ADK_sparc
- default "sparc64" if ADK_sparc64
- default "sh" if ADK_sh
- default "x86" if ADK_x86
- default "x86_64" if ADK_x86_64
-
diff --git a/target/config/Config.in.system b/target/config/Config.in.system
deleted file mode 100644
index 670fcc4..0000000
--- a/target/config/Config.in.system
+++ /dev/null
@@ -1,2 +0,0 @@
-source "target/config/Config.in.system.default"
-source "target/config/Config.in.system.choice"
diff --git a/target/config/Config.in.system.choice b/target/config/Config.in.system.choice
deleted file mode 100644
index a95dd92..0000000
--- a/target/config/Config.in.system.choice
+++ /dev/null
@@ -1,13 +0,0 @@
-source "target/aarch64/Config.in"
-source "target/arm/Config.in"
-source "target/m68k/Config.in"
-source "target/microblaze/Config.in"
-source "target/mips/Config.in"
-source "target/mips64/Config.in"
-source "target/ppc/Config.in"
-source "target/ppc64/Config.in"
-source "target/sparc/Config.in"
-source "target/sparc64/Config.in"
-source "target/sh/Config.in"
-source "target/x86/Config.in"
-source "target/x86_64/Config.in"
diff --git a/target/m68k/Config.in b/target/m68k/Config.in
deleted file mode 100644
index 96ace42..0000000
--- a/target/m68k/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_M68K && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_M68K
- boolean "Choose target system"
-
-source "target/m68k/Config.in.systems"
-endchoice
diff --git a/target/microblaze/Config.in b/target/microblaze/Config.in
deleted file mode 100644
index 582be77..0000000
--- a/target/microblaze/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_MICROBLAZE && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_MICROBLAZE
- boolean "Choose target system"
-
-source "target/microblaze/Config.in.systems"
-endchoice
diff --git a/target/mips/Config.in b/target/mips/Config.in
deleted file mode 100644
index bbae13a..0000000
--- a/target/mips/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_MIPS && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_MIPS
- boolean "Choose target system"
-
-source "target/mips/Config.in.systems"
-endchoice
diff --git a/target/mips64/Config.in b/target/mips64/Config.in
deleted file mode 100644
index d890f6f..0000000
--- a/target/mips64/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_MIPS64 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_MIPS64
- boolean "Choose target system"
-
-source "target/mips64/Config.in.systems"
-endchoice
diff --git a/target/ppc/Config.in b/target/ppc/Config.in
deleted file mode 100644
index 272621e..0000000
--- a/target/ppc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_PPC && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_PPC
- boolean "Choose target system"
-
-source "target/ppc/Config.in.systems"
-endchoice
diff --git a/target/ppc64/Config.in b/target/ppc64/Config.in
deleted file mode 100644
index a262de1..0000000
--- a/target/ppc64/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_PPC64 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_PPC64
- boolean "Choose target system"
-
-source "target/ppc64/Config.in.systems"
-endchoice
diff --git a/target/sh/Config.in b/target/sh/Config.in
deleted file mode 100644
index 4dfe7ba..0000000
--- a/target/sh/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_SH && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_SH
- boolean "Choose target system"
-
-source "target/sh/Config.in.systems"
-endchoice
diff --git a/target/sparc/Config.in b/target/sparc/Config.in
deleted file mode 100644
index 38db872..0000000
--- a/target/sparc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_SPARC && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_SPARC
- boolean "Choose target system"
-
-source "target/sparc/Config.in.systems"
-endchoice
diff --git a/target/sparc64/Config.in b/target/sparc64/Config.in
deleted file mode 100644
index 14981f0..0000000
--- a/target/sparc64/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_SPARC64 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_SPARC64
- boolean "Choose target system"
-
-source "target/sparc64/Config.in.systems"
-endchoice
diff --git a/target/x86/Config.in b/target/x86/Config.in
deleted file mode 100644
index 037dfb4..0000000
--- a/target/x86/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_X86 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_X86
- boolean "Choose target system"
-
-source "target/x86/Config.in.systems"
-endchoice
diff --git a/target/x86_64/Config.in b/target/x86_64/Config.in
deleted file mode 100644
index eda6e94..0000000
--- a/target/x86_64/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_X86_64 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_X86_64
- boolean "Choose target system"
-
-source "target/x86_64/Config.in.systems"
-endchoice