Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 92 insertions, 15 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 5c1874264..498c5d9e4 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -787,7 +787,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 config ADK_TARGET_ROOTFS_JFFS2
 	bool "Compressed read-write root filesystem (jffs2)"
 	select ADK_KERNEL_JFFS2_FS
-	select ADK_HOST_NEED_JFFS2
+	select ADK_HOST_NEED_MTD_UTILS
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_TARGET_WITH_MTD
 	help
@@ -868,8 +868,9 @@ config ADK_TARGET_ROOTFS_ISO
 	select ADK_KERNEL_JOLIET
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV_SR
-	select ADK_HOST_NEED_MKISOFS
+	select ADK_HOST_NEED_CDRTOOLS
 	select ADK_HOST_NEED_SYSLINUX
+	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_HOST_LINUX
 	depends on ADK_LINUX_X86
 	help
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index a6f504a49..776a1a6f9 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Start getty or shell after bootup"
-default ADK_RUNTIME_GETTY
 default ADK_RUNTIME_SHELL if ADK_PKG_TEST
+default ADK_RUNTIME_GETTY
 
 config ADK_RUNTIME_GETTY
 	boolean "start a getty after bootup"
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index b232a3674..92bbae9d6 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -1,16 +1,67 @@
-config ADK_HOST_NEED_MKISOFS
+# always required from OpenADK
+config ADK_HOST_BUILD_HEIRLOOM_CPIO
+	boolean
+	default y
+
+config ADK_HOST_BUILD_MKCRYPT
+	boolean
+	default y
+
+# always required, but can be provided by host
+config ADK_HOST_BUILD_BASH
 	boolean
 	default n
 
-config ADK_HOST_NEED_SYSLINUX
+config ADK_HOST_BUILD_BC
+	boolean
+	default n
+
+config ADK_HOST_BUILD_BISON
+	boolean
+	default n
+
+config ADK_HOST_BUILD_BZIP2
+	boolean
+	default n
+
+config ADK_HOST_BUILD_FILE
+	boolean
+	default n
+
+config ADK_HOST_BUILD_FINDUTILS
+	boolean
+	default n
+
+config ADK_HOST_BUILD_FLEX
+	boolean
+	default n
+
+config ADK_HOST_BUILD_M4
 	boolean
 	default n
 
-config ADK_HOST_NEED_SQUASHFS
+config ADK_HOST_BUILD_PKGCONF
+	boolean
+	default n
+
+config ADK_HOST_BUILD_XZ
+	boolean
+	default n
+
+# optional, but can be provided by host
+config ADK_HOST_NEED_CCACHE
 	boolean
 	default n
 
-config ADK_HOST_NEED_JFFS2
+config ADK_HOST_BUILD_CCACHE
+	boolean
+	default n
+
+config ADK_HOST_NEED_CDRTOOLS
+	boolean
+	default n
+
+config ADK_HOST_BUILD_CDRTOOLS
 	boolean
 	default n
 
@@ -18,7 +69,7 @@ config ADK_HOST_NEED_GENEXT2FS
 	boolean
 	default n
 
-config ADK_HOST_NEED_LZOP
+config ADK_HOST_BUILD_GENEXT2FS
 	boolean
 	default n
 
@@ -26,23 +77,50 @@ config ADK_HOST_NEED_LZMA
 	boolean
 	default n
 
-config ADK_HOST_NEED_BZIP2
+config ADK_HOST_BUILD_LZMA
 	boolean
 	default n
 
-config ADK_HOST_NEED_XZ
+config ADK_HOST_NEED_LZOP
 	boolean
 	default n
 
-config ADK_HOST_NEED_CCACHE
+config ADK_HOST_BUILD_LZOP
 	boolean
 	default n
 
-config ADK_HOST_NEED_MKIMAGE
+config ADK_HOST_NEED_MKSH
 	boolean
 	default n
 
-config ADK_HOST_NEED_PCRE
+config ADK_HOST_BUILD_MKSH
+	boolean
+	default n
+
+config ADK_HOST_NEED_SYSLINUX
+	boolean
+	default n
+
+config ADK_HOST_BUILD_SYSLINUX
+	boolean
+	default n
+
+# optional, must be used from OpenADK
+config ADK_HOST_BUILD_MTD_UTILS
+	boolean
+	default n
+
+config ADK_HOST_BUILD_SQUASHFS
+	boolean
+	default n
+
+config ADK_HOST_BUILD_MKIMAGE
+	boolean
+	default n
+
+config ADK_HOST_BUILD_PCRE
 	boolean
 	default y if ADK_HOST_DARWIN
 	default n
+
+source "target/config/Config.in.prereq"
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze
index a5bdb65e8..ee9cb6a52 100644
--- a/target/microblaze/sys-available/qemu-microblaze
+++ b/target/microblaze/sys-available/qemu-microblaze
@@ -6,7 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
-	select ADK_HOST_NEED_MKIMAGE
 	help
 	 Qemu support for microblaze big endian architecture.
 
diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel
index 4d752a942..8dff0e260 100644
--- a/target/microblaze/sys-available/qemu-microblazeel
+++ b/target/microblaze/sys-available/qemu-microblazeel
@@ -6,7 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
-	select ADK_HOST_NEED_MKIMAGE
 	help
 	 Qemu support for microblaze little endian architecture.