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

21 files changed, 71 insertions, 66 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 78079bea9..af1313206 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -471,9 +471,9 @@ bulktoolchain:
 		while read arch; do \
 			mkdir -p ${TOPDIR}/firmware; \
 		    ( \
-			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
 			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
+			echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 3956306e9..dae0e5805 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -42,9 +42,6 @@ else
 USB:=		rootdelay=2
 endif
 
-$(eval $(call rootfs_template,genext2fs,GENEXT2FS,$(ROOTFS)))
-$(eval $(call rootfs_template,cf,CF,$(ROOTFS)))
-$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS)))
 $(eval $(call rootfs_template,usb,USB,$(USB)))
 $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
 $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))
diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile
index 39d97a3dc..8dbc5e32a 100644
--- a/package/pkgconf/Makefile
+++ b/package/pkgconf/Makefile
@@ -22,6 +22,7 @@ HOST_STYLE:=		auto
 
 hostpost-install:
 	(cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config)
+	(cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf $(GNU_TARGET_NAME)-pkg-config)
 
 pkgconf-install:
 	$(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 4c2067ac9..6ca93afa3 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,13 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		1.7.0
+PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		32893941d40d052a5e649efcf06aca06
+PKG_MD5SUM:=		9541063d999cf9659ed7fdce71314f31
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		zlib libsdl libpng
-PKG_BUILDDEP:=		gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng
+PKG_DEPENDS:=		zlib glib
+PKG_BUILDDEP:=		gettext-tiny libiconv-tiny glib-host 
+PKG_BUILDDEP+=		qemu-host zlib glib
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 
@@ -24,17 +25,18 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=	-pthread -lm -lrt
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
+			--cross-prefix=$(GNU_TARGET_NAME)- \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--enable-kvm \
 			--disable-docs \
+			--disable-sdl \
 			--bindir=/usr/bin
 
 HOST_STYLE:=		manual
+CFLAGS_FOR_BUILD+=	-DNATIVE
 HOST_CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 			--disable-docs \
 			--disable-werror \
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
index 1eba70417..aa243b148 100644
--- a/package/qemu/patches/patch-linux-user_syscall_c
+++ b/package/qemu/patches/patch-linux-user_syscall_c
@@ -1,22 +1,26 @@
---- qemu-1.7.0.orig/linux-user/syscall.c	2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/linux-user/syscall.c	2014-01-31 09:51:34.051058876 +0100
-@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch
+--- qemu-1.7.1.orig/linux-user/syscall.c	2014-03-25 15:01:10.000000000 +0100
++++ qemu-1.7.1/linux-user/syscall.c	2014-04-02 16:56:13.483513278 +0200
+@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch
+ //#include <sys/user.h>
  #include <netinet/ip.h>
  #include <netinet/tcp.h>
- #include <linux/wireless.h>
 +#include <linux/version.h>
+ #include <linux/wireless.h>
  #include <linux/icmp.h>
  #include "qemu-common.h"
- #ifdef TARGET_GPROF
-@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch
+@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch
  #include <linux/utsname.h>
  #include <linux/cdrom.h>
  #include <linux/hdreg.h>
++#ifdef NATIVE
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
  #include <linux/soundcard.h>
 +#else
 +#include <linux/soundcard.h.oss3>
 +#endif
++#else
++#include <linux/soundcard.h>
++#endif
  #include <linux/kd.h>
  #include <linux/mtio.h>
  #include <linux/fs.h>
diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c
new file mode 100644
index 000000000..ed524628a
--- /dev/null
+++ b/package/qemu/patches/patch-util_qemu-openpty_c
@@ -0,0 +1,11 @@
+--- qemu-1.7.0.orig/util/qemu-openpty.c	2013-11-27 23:15:55.000000000 +0100
++++ qemu-1.7.0/util/qemu-openpty.c	2014-03-14 09:05:17.280258135 +0100
+@@ -35,7 +35,7 @@
+ #include "config-host.h"
+ #include "qemu-common.h"
+ 
+-#if defined(__GLIBC__)
++#if defined(__linux__)
+ # include <pty.h>
+ #elif defined CONFIG_BSD
+ # include <termios.h>
diff --git a/package/squashfs/Makefile b/package/squashfs/Makefile
index 575849acd..8478f6c57 100644
--- a/package/squashfs/Makefile
+++ b/package/squashfs/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		4.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b7a781fb4cf8938842279bd3e8ee852
 PKG_DESCR:=		squashfs filesystem utilities
+HOST_BUILDDEP:=		xz-host
 PKG_SECTION:=		fs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=squashfs/}
 
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..1255ceae3 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
 
@@ -833,35 +825,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 +842,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.tools b/target/config/Config.in.tools
index 2159b4db7..95e4f6d63 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -106,16 +106,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/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