resolve merge conflict

97 files changed, 1644 insertions, 1287 deletions

diff --git a/target/aarch64/sys-available/toolchain-aarch64 b/target/aarch64/sys-available/toolchain-aarch64
index 638c3cdcf..bcdfd2289 100644
--- a/target/aarch64/sys-available/toolchain-aarch64
+++ b/target/aarch64/sys-available/toolchain-aarch64
@@ -6,9 +6,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
 	select ADK_soft_float
 	select ADK_fpu_vfp
 	select ADK_eabi
-	select ADK_TOOLCHAIN
 	select ADK_CPU_ARMV8
 	select ADK_LINUX_64
+	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  AARCH64 toolchain.
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 2dce4fb31..d3edb99c6 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	bool "Cubox-i"
 	select ADK_arm
 	select ADK_little
-	select ADK_hard_float
 	select ADK_eabihf
 	select ADK_fpu_neon
 	select ADK_cubox_i
 	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
@@ -22,5 +22,5 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT_IMX6
 	help
-	  Cubox-i
+	  Solidrun Cubox-i
 
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 1fa057c4b..848179629 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -3,9 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_arm
 	select ADK_qemu_arm
 	select ADK_little
-	select ADK_soft_float
 	select ADK_eabi
-	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Qemu Emulator (arm).
+	  Qemu Emulator for arm architecture.
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf
deleted file mode 100644
index dab039931..000000000
--- a/target/arm/sys-available/qemu-armhf
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARMHF
-	bool "Qemu Emulator (hard-float)"
-	select ADK_arm
-	select ADK_qemu_armhf
-	select ADK_little
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_fpu_vfp
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Qemu Emulator (armhf).
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 6326a1e57..45fd531d3 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
 	select ADK_arm
 	select ADK_little
-	select ADK_hard_float
 	select ADK_eabihf
 	select ADK_fpu_vfp
 	select ADK_raspberry_pi
 	select ADK_CPU_ARM1176JZF_S
+	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 876bcd84a..a98f9c225 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,12 +1,10 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only (soft float)"
+	bool "Toolchain only"
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
-	select ADK_soft_float
 	select ADK_eabi
-	select ADK_TOOLCHAIN
+	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_CPU_CORTEX_A9
 	help
-	  ARM toolchain (soft float) for Cortex A9.
+	  ARM toolchain.
diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf
deleted file mode 100644
index 252a41aa2..000000000
--- a/target/arm/sys-available/toolchain-armhf
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF
-	bool "Toolchain only (hard float)"
-	select ADK_arm
-	select ADK_little
-	select ADK_hard_float
-	select ADK_eabihf
-	select ADK_fpu_vfp
-	select ADK_toolchain_armhf
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_CPU_CORTEX_A9
-	help
-	  ARM toolchain (hard float) for Cortex A9.
-
diff --git a/target/config/Config.in b/target/config/Config.in
index 25582aa5b..edabfa5e3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -1,245 +1,20 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-
-config ADK_TARGET_KERNEL_VMLINUZ
-	boolean
-
-config ADK_TARGET_KERNEL_ZIMAGE
-	boolean
-
-config ADK_TARGET_KERNEL_LINUXBIN
-	boolean
-
-config ADK_TARGET_KERNEL_IMAGE
-	boolean
-
-config ADK_TARGET_KERNEL_UIMAGE
-	boolean
-
-config ADK_TARGET_KERNEL_BZIMAGE
-	boolean
-
-config ADK_TARGET_KERNEL
-	string
-	default "uImage" if ADK_TARGET_KERNEL_UIMAGE
-	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
-	default "Image" if ADK_TARGET_KERNEL_IMAGE
-	default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN
-	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
-	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
-	default "vmlinux"
-
-config ADK_big
-	boolean
-
-config ADK_little
-	boolean
-
-config ADK_soft_float
-	boolean
-
-config ADK_hard_float
-	boolean
-
-config ADK_fpu_neon
-	boolean
-
-config ADK_fpu_vfp
-	boolean
-
-config ADK_TARGET_FLOAT
-	string
-	default "hard" if ADK_hard_float
-	default "soft" if ADK_soft_float
-
-config ADK_TARGET_FPU
-	string
-	default "vfp" if ADK_fpu_vfp
-	default "neon" if ADK_fpu_neon
-
-config ADK_TARGET_ENDIAN
-	string
-	default "little" if ADK_little
-	default "big" if ADK_big
-
-config ADK_JFFS2_OPTS
-	string
-	default "-l" if ADK_little
-	default "-b" if ADK_big
-
-config ADK_TOOLCHAIN
-	boolean
-
-source "target/config/Config.in.arch"
-source "target/config/Config.in.system"
-source "target/config/Config.in.hardware"
-source "target/config/Config.in.qemu"
-
-config ADK_LINUX_MIPS64
-	boolean
-	default y if ADK_LINUX_MIPS && ADK_LINUX_64
-
-choice
-prompt "Toolchain options"
-depends on ADK_TOOLCHAIN
-config ADK_TOOLCHAIN_ONLY
-	boolean "Only build toolchain and selected packages"
-
-config ADK_TOOLCHAIN_ARCHIVE
-	boolean "Build a complete system usable f.e. via chroot"
-
-endchoice
-
-config ADK_32
-	boolean
-
-config ADK_64
-	boolean
-
-config ADK_x32
-	boolean
-
-config ADK_o32
-	boolean
-
-config ADK_n32
-	boolean
-
-config ADK_n64
-	boolean
-
-config ADK_eabi
-	boolean
-
-config ADK_eabihf
+# global symbols
+config ADK_LINUX_64
 	boolean
 
-config ADK_TARGET_ABI
-	string
-	default "n32" if ADK_n32
-	default "n64" if ADK_n64
-	default "32" if ADK_32
-	default "x32" if ADK_x32
-	default "eabi" if ADK_eabi
-	default "eabihf" if ADK_eabihf
-
-config ADK_TARGET_MIPS_ABI
-	depends on ADK_LINUX_MIPS
-	string
-	default "32" if ADK_o32
-	default "n32" if ADK_n32
-	default "64" if ADK_n64
-
-choice
-prompt "Target ABI"
-depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU
-
-config ADK_TARGET_ABI_N32
-	boolean "N32 ABI (new)"
-	select ADK_n32
-
-config ADK_TARGET_ABI_O32
-	boolean "O32 ABI (old)"
-	select ADK_o32
-
-config ADK_TARGET_ABI_N64
-	boolean "N64 ABI"
-	select ADK_n64
-
-endchoice
-
-choice
-prompt "Target ABI"
-depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU
-
-config ADK_TARGET_ABI_64
-	boolean "64 Bit ABI"
-	select ADK_64
-
-config ADK_TARGET_ABI_X32
-	boolean "x32 ABI (new)"
-	select ADK_x32
-
-config ADK_TARGET_ABI_32
-	boolean "32 Bit ABI"
-	select ADK_32
-
-endchoice
-
-config ADK_TARGET_LIBC_PATH
-	string
-	default "lib" if ADK_32
-	default "lib32" if ADK_n32
-	default "libx32" if ADK_x32
-	default "lib64" if ADK_n64 \
-				|| ADK_64 \
-				|| ADK_LINUX_SPARC64 \
-				|| ADK_LINUX_PPC64 \
-				|| ADK_LINUX_X86_64
-	default "lib"
-
-config ADK_TARGET_KERNEL_MINICONFIG
-	string
-	default "arm-fm" if ADK_TARGET_SYSTEM_ARM_FM
-	default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	defau