resolve merge conflict

104 files changed, 1689 insertions, 1498 deletions

diff --git a/Config.in b/Config.in
index 892fab4a4..de2c0225e 100644
--- a/Config.in
+++ b/Config.in
@@ -1,10 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config MODULES
-	bool
-	default y
-
 config ADK_HAVE_DOT_CONFIG
 	bool
 	default y
@@ -18,6 +14,7 @@ config ADK_CHOOSE_TARGET_SYSTEM
 	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
@@ -27,6 +24,20 @@ config ADK_CHOOSE_TARGET_SYSTEM
 	default y if ADK_CHOOSE_TARGET_SYSTEM_X86_64
 	default n
 
+source "target/config/Config.in.cpu"
+source "target/config/Config.in.hardware"
+source "target/config/Config.in.kernel"
+source "target/config/Config.in.arch"
+source "target/config/Config.in.system"
+source "target/config/Config.in.endian"
+source "target/config/Config.in.abi"
+source "target/config/Config.in.arm"
+source "target/config/Config.in.x86"
+source "target/config/Config.in.qemu"
+source "target/config/Config.in.kernelversion"
+source "target/config/Config.in.libc"
+source "target/config/Config.in.toolchain"
+source "target/config/Config.in.qemuopts"
 source "target/config/Config.in"
 
 menu "Package collection"
@@ -86,134 +97,10 @@ depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 source "target/config/Config.in.runtime"
 endmenu
 
-choice
-prompt "Kernel Version"
-depends on ADK_TOOLCHAIN_ONLY
-
-config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.14.4"
-	boolean
-	depends on ADK_TOOLCHAIN_ONLY
-
-endchoice
-
 menu "Kernel configuration"
-depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
-
-choice
-prompt "Kernel Version"
-default ADK_KERNEL_VERSION_3_14_4
-
-config ADK_KERNEL_VERSION_3_15_RC6
-	prompt "3.15-rc6"
-	boolean
-
-config ADK_KERNEL_VERSION_3_14_4
-	prompt "3.14.4"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_13_11
-	prompt "3.13.11"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_12_20
-	prompt "3.12.20"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_10_40
-	prompt "3.10.40"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_10_30
-	prompt "3.10.30"
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_4_90
-	prompt "3.4.90"
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-endchoice
-
-config ADK_KERNEL_VERSION
-	string
-	default "3.15-rc6" if ADK_KERNEL_VERSION_3_15_RC6
-	default "3.14.4" if ADK_KERNEL_VERSION_3_14_4
-	default "3.13.11" if ADK_KERNEL_VERSION_3_13_11
-	default "3.12.20" if ADK_KERNEL_VERSION_3_12_20
-	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.10.40" if ADK_KERNEL_VERSION_3_10_40
-	default "3.10.30" if ADK_KERNEL_VERSION_3_10_30
-	default "3.4.90" if ADK_KERNEL_VERSION_3_4_90
-	help
-
-config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
-        boolean
-        select ADK_KERNEL_RD_GZIP
-        select ADK_KERNEL_KERNEL_GZIP
-        select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y
-
-choice
-prompt "Kernel Compression"
-depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_MIKROTIK_RB532
-
-config ADK_KERNEL_COMP_XZ
-	prompt "use XZ compression"
-	boolean
-	select ADK_KERNEL_RD_XZ
-	select ADK_KERNEL_KERNEL_XZ
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-
-config ADK_KERNEL_COMP_LZMA
-	prompt "use LZMA compression"
-	boolean
-	select ADK_KERNEL_RD_LZMA
-	select ADK_KERNEL_KERNEL_LZMA
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
-
-config ADK_KERNEL_COMP_LZO
-	prompt "use LZO compression"
-	boolean
-	select ADK_KERNEL_RD_LZO
-	select ADK_KERNEL_KERNEL_LZO
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
-
-config ADK_KERNEL_COMP_GZIP
-	prompt "use GZIP compression"
-	boolean
-	select ADK_KERNEL_RD_GZIP
-	select ADK_KERNEL_KERNEL_GZIP
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-
-config ADK_KERNEL_COMP_BZIP2
-	prompt "use BZIP2 compression"
-	boolean
-	select ADK_KERNEL_RD_BZIP2
-	select ADK_KERNEL_KERNEL_BZIP2
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
-
-endchoice
-
-config ADK_COMPRESSION_TOOL
-	string
-	default "gzip -n9" if ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-	default "bzip2" if ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
-	default "xz --check=crc32" if ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	default "lzma -9" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
-	default "lzop" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
-	default "gzip -n9"
-	help
-
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 source "target/linux/Config.in"
 endmenu
 
+source "target/config/Config.in.target"
 source "target/config/Config.in.adk"
-source "toolchain/Config.in"
diff --git a/mk/build.mk b/mk/build.mk
index b59fa65f1..98f5ce3ee 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -35,10 +35,9 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PKG_TEST=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
-			ADK_TOOLCHAIN_USE_SSP=n \
-			ADK_TOOLCHAIN_USE_LTO=n \
-			ADK_TOOLCHAIN_GOLD=n \
-			ADK_TOOLCHAIN_USE_GOLD=n \
+			ADK_TOOLCHAIN_WITH_SSP=n \
+			ADK_TOOLCHAIN_WITH_LTO=n \
+			ADK_TOOLCHAIN_WITH_GOLD=n \
 			ADK_LINUX_ARM_WITH_THUMB=n \
 			BUSYBOX_IFPLUGD=n \
 			BUSYBOX_EXTRA_COMPAT=n \
@@ -114,12 +113,6 @@ POSTCONFIG=		-@\
 			touch .rebuild.bkeymaps;\
 			rebuild=1;\
 		fi; \
-		if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \
-			make kernelclean;\
-		fi; \
-		if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \
-			echo "You should make cleandir, after changing thumb mode";\
-		fi; \
 		if [ $$rebuild -eq 1 ];then \
 			cp .config .config.old;\
 		fi; \
diff --git a/mk/image.mk b/mk/image.mk
index 9c657d404..62ac155f8 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -64,8 +64,8 @@ endif
 ifeq ($(ADK_LINUX_X86_64),y)
 ifeq ($(ADK_TARGET_ABI_32),)
 	# fixup lib dirs
-	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
-	rm -rf ${TARGET_DIR}/lib/
+	test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
+	test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
@@ -75,8 +75,8 @@ endif
 endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
-	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
-	rm -rf ${TARGET_DIR}/lib/
+	test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
+	test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
@@ -85,8 +85,8 @@ ifeq ($(ADK_LINUX_PPC64),y)
 endif
 ifeq ($(ADK_LINUX_SPARC64),y)
 	# fixup lib dirs
-	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
-	rm -rf ${TARGET_DIR}/lib/
+	test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
+	test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
@@ -95,8 +95,8 @@ ifeq ($(ADK_LINUX_SPARC64),y)
 endif
 ifeq ($(ADK_TARGET_ABI_N32),y)
 	# fixup lib dirs
-	mv ${TARGET_DIR}/lib/* ${TARGET_DIR