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

16 files changed, 56 insertions, 51 deletions

diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index f3aded1d6..ac2ec191c 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_acmesystems_foxg20
 	select ADK_KERNEL_AEABI
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_IMAGE
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 8c87c9791..3b96514c8 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_fpu_neon
 	select ADK_cubox_i
 	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 472db927a..319df3523 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_fpu_vfp
 	select ADK_raspberry_pi
 	select ADK_CPU_ARM1176JZF_S
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
diff --git a/target/config/Config.in b/target/config/Config.in
index 498c5d9e4..501039ed1 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -270,8 +270,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK
 	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH
-	select ADK_HOST_NEED_JFFS2 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	select ADK_HOST_NEED_SQUASHFS if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 
 endchoice
 
@@ -360,12 +358,6 @@ config ADK_TARGET_WITH_ACPI
 config ADK_TARGET_WITH_VGA
 	boolean
 
-config ADK_TARGET_WITH_CF
-	boolean
-
-config ADK_TARGET_WITH_MMC
-	boolean
-
 config ADK_TARGET_WITH_NAND
 	boolean
 
@@ -779,6 +771,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	bool "Compressed read-only root filesystem (squashfs)"
 	select ADK_KERNEL_SQUASHFS
 	select ADK_HOST_NEED_SQUASHFS
+	select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_TARGET_WITH_MTD
 	help
@@ -833,35 +826,6 @@ config ADK_TARGET_ROOTFS_USB
 	help
 	  Boot system from USB stick.
 
-config ADK_TARGET_ROOTFS_CF
-	bool "read-write filesystem for compact flash"
-	depends on ADK_TARGET_WITH_CF
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_SCSI
-	help
-	  Use this option if you have a compact flash based system.
-	  (ext2 filesystem is used.)
-
-config ADK_TARGET_ROOTFS_GENEXT2FS
-	bool "read-write filesystem for compact flash (genext2fs version)"
-	depends on ADK_TARGET_WITH_CF
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_SCSI
-	select ADK_HOST_NEED_GENEXT2FS
-	help
-	  Use this option if you have a compact flash based system.
-	  (ext2 filesystem is used.)
-
-config ADK_TARGET_ROOTFS_MMC
-	bool "read-write filesystem for mmc/sdcard"
-	depends on ADK_TARGET_WITH_MMC
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_SCSI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	help
-	  Use this option if you have a MMC/SDCARD based system.
-	  (ext2 filesystem is used.)
-
 config ADK_TARGET_ROOTFS_ISO
 	bool "ISO image"
 	select ADK_KERNEL_ISO9660_FS
@@ -879,7 +843,7 @@ config ADK_TARGET_ROOTFS_ISO
 config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 	bool "Archive usable for initramfs creation"
 	help
-	  Use this option if your palnning to create a initramfs,
+	  Use this option if your planning to create a initramfs,
 	  useful for adk-test-framework.
 
 config ADK_TARGET_ROOTFS_ARCHIVE
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 0c598e50c..7487ac056 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -33,6 +33,13 @@ config ADK_DEBUG
 	  All packages and libc will be compiled and packaged with debug information.
 	  Mostly useful for NFS root or big USB/CF or hard disk setups.
 
+config ADK_DEBUG_OPTS
+	bool "use optimization cflags"
+	depends on ADK_DEBUG
+	default n
+	help
+	  All packages and libc will be compiled with debug information and optimization flags on.
+
 config ADK_DEBUG_STRIP
 	bool "strip target binaries/libraries for gdbserver usage"
 	depends on ADK_DEBUG
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 2159b4db7..f95a4508b 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -97,6 +97,14 @@ config ADK_HOST_BUILD_MKSH
 	boolean
 	default n
 
+config ADK_HOST_NEED_QEMU
+	boolean
+	default n
+
+config ADK_HOST_BUILD_QEMU
+	boolean
+	default n
+
 config ADK_HOST_NEED_SYSLINUX
 	boolean
 	default n
@@ -106,16 +114,31 @@ config ADK_HOST_BUILD_SYSLINUX
 	default n
 
 # optional, must be used from OpenADK
+config ADK_HOST_NEED_MTD_UTILS
+	boolean
+	default n
+
 config ADK_HOST_BUILD_MTD_UTILS
 	boolean
+	default y if ADK_HOST_NEED_MTD_UTILS
+	default n
+
+config ADK_HOST_NEED_SQUASHFS
+	boolean
 	default n
 
 config ADK_HOST_BUILD_SQUASHFS
 	boolean
+	default y if ADK_HOST_NEED_SQUASHFS
+	default n
+
+config ADK_HOST_NEED_MKIMAGE
+	boolean
 	default n
 
 config ADK_HOST_BUILD_MKIMAGE
 	boolean
+	default y if ADK_HOST_NEED_MKIMAGE
 	default n
 
 config ADK_HOST_BUILD_PCRE
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 3cb0517ac..5ebf38794 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -72,8 +72,6 @@ config ADK_KERNEL_SQUASHFS
 
 config ADK_KERNEL_EXT2_FS
 	boolean
-	default y if ADK_TARGET_WITH_CF
-	default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
@@ -196,7 +194,7 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	select ADK_KERNEL_BLOCK
-	default y if ADK_TARGET_WITH_MMC
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
 	  This option provides support for normal Windows file systems with
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 58d02c5be..4a39e1c3b 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -18,7 +18,7 @@ endif
 
 ifeq ($(ADK_TARGET_FS),squashfs)
 imageinstall: $(BUILD_DIR)/root.squashfs
-	qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE)
+	env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE)
 	dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532
index b787a3852..96ca4d46d 100644
--- a/target/mips/sys-available/mikrotik-rb532
+++ b/target/mips/sys-available/mikrotik-rb532
@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_mikrotik_rb532
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_LEDS
 	depends on ADK_BROKEN
diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
new file mode 100644
index 000000000..4d7fff826
--- /dev/null
+++ b/target/sh/sys-available/toolchain-sh4
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
+	bool "Toolchain only (little endian)"
+	select ADK_sh
+	select ADK_little
+	select ADK_toolchain_sh
+	select ADK_CPU_SH4
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  Build a superh toolchain (sh4).
+
diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb
new file mode 100644
index 000000000..cccc163e1
--- /dev/null
+++ b/target/sh/sys-available/toolchain-sh4eb
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB
+	bool "Toolchain only (big endian)"
+	select ADK_sh
+	select ADK_big
+	select ADK_toolchain_sheb
+	select ADK_CPU_SH4
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  Build a superh toolchain (sh4 big endian).
+
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index f55b1f622..80c5bf531 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/sys-available/ibm-x40
@@ -13,7 +13,6 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_PCI
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 902c004a1..484439328 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_KERNEL_BZIMAGE
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index c92c0d36e..33e939348 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/target/x86/sys-available/pcengines-alix2d13
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	help
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index fd83a700a..a48bec2cc 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/target/x86/sys-available/pcengines-alix2d2
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	help
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index 2fa4e13c4..50db08ccf 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/target/x86/sys-available/pcengines-wrap
@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_pcengines_wrap
 	select ADK_CPU_I486
 	select ADK_KERNEL_I486
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_KERNEL_BZIMAGE