Browse Source

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

Waldemar Brodkorb 11 years ago
parent
commit
c57d4ab6ff

+ 1 - 1
mk/build.mk

@@ -471,9 +471,9 @@ bulktoolchain:
 		while read arch; do \
 		while read arch; do \
 			mkdir -p ${TOPDIR}/firmware; \
 			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#" ); \
 			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#" ); \
 			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) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\

+ 5 - 5
mk/image.mk

@@ -60,7 +60,7 @@ ifeq ($(ADK_TARGET_ABI_32),)
 	rm -rf ${TARGET_DIR}/lib/
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
-	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
@@ -71,7 +71,7 @@ ifeq ($(ADK_LINUX_PPC64),y)
 	rm -rf ${TARGET_DIR}/lib/
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
-	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
@@ -81,7 +81,7 @@ ifeq ($(ADK_LINUX_SPARC64),y)
 	rm -rf ${TARGET_DIR}/lib/
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
-	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
@@ -91,7 +91,7 @@ ifeq ($(ADK_TARGET_ABI_N32),y)
 	rm -rf ${TARGET_DIR}/lib/
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
-	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif
@@ -101,7 +101,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
 	rm -rf ${TARGET_DIR}/lib/
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
-	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	-mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 endif

+ 0 - 3
mk/rootfs.mk

@@ -42,9 +42,6 @@ else
 USB:=		rootdelay=2
 USB:=		rootdelay=2
 endif
 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,usb,USB,$(USB)))
 $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
 $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
 $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))
 $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))

+ 9 - 0
mk/vars.mk

@@ -123,8 +123,17 @@ TARGET_CXXFLAGS+=	-flto
 TARGET_LDFLAGS+=	-flto
 TARGET_LDFLAGS+=	-flto
 endif
 endif
 
 
+ifeq ($(ADK_LINUX_MICROBLAZE),y)
+TARGET_CFLAGS+=		-mxl-barrel-shift
+TARGET_CXX_FLAGS+=	-mxl-barrel-shift
+endif
+
 ifneq ($(ADK_DEBUG),)
 ifneq ($(ADK_DEBUG),)
+ifeq ($(ADK_DEBUG_OPTS),y)
+TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
+else
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
+endif
 else
 else
 TARGET_CPPFLAGS+=	-DNDEBUG
 TARGET_CPPFLAGS+=	-DNDEBUG
 TARGET_CFLAGS+=		-fomit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
 TARGET_CFLAGS+=		-fomit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)

+ 1 - 1
package/adk-helper/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		adk helper utilities
 PKG_DESCR:=		adk helper utilities
 PKG_SECTION:=		misc
 PKG_SECTION:=		misc
 
 
-PKG_CFLINE_MKCRYPT:=	depends on ADK_HOST_ONLY
+PKG_CFLINE_ADK_HELPER:=	depends on ADK_HOST_ONLY
 
 
 NO_DISTFILES:=		1
 NO_DISTFILES:=		1
 
 

+ 1 - 0
package/pkgconf/Makefile

@@ -22,6 +22,7 @@ HOST_STYLE:=		auto
 
 
 hostpost-install:
 hostpost-install:
 	(cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config)
 	(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:
 pkgconf-install:
 	$(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin
 	$(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin

+ 16 - 12
package/qemu/Makefile

@@ -4,13 +4,15 @@
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=		qemu
 PKG_NAME:=		qemu
-PKG_VERSION:=		1.7.0
+PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		32893941d40d052a5e649efcf06aca06
+PKG_MD5SUM:=		9541063d999cf9659ed7fdce71314f31
 PKG_DESCR:=		cpu and system emulator
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
 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
+PKG_BUILDDEP+=		zlib glib
+HOST_BUILDDEP:=		glib-host
 PKG_URL:=		http://wwww.qemu.org/
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 PKG_SITES:=		http://wiki.qemu.org/download/
 
 
@@ -24,18 +26,20 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE}))
 $(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}))
 $(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
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
+			--cross-prefix=$(GNU_TARGET_NAME)- \
 			--prefix=/usr \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--sysconfdir=/etc \
 			--enable-kvm \
 			--enable-kvm \
 			--disable-docs \
 			--disable-docs \
+			--disable-sdl \
 			--bindir=/usr/bin
 			--bindir=/usr/bin
 
 
+CFLAGS_FOR_BUILD+=	-DNATIVE
 HOST_STYLE:=		manual
 HOST_STYLE:=		manual
 HOST_CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 HOST_CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
+			--prefix=${STAGING_HOST_DIR}/usr \
 			--disable-docs \
 			--disable-docs \
 			--disable-werror \
 			--disable-werror \
 			--disable-system \
 			--disable-system \
@@ -43,17 +47,17 @@ HOST_CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 
 
 host-configure:
 host-configure:
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
-	    env ${HOST_CONFIGURE_ENV} \
-	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
-	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
+		env ${HOST_CONFIGURE_ENV} \
+		${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
+		${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
 
 
 host-build:
 host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
-	
+		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
+       
 qemu-hostinstall:
 qemu-hostinstall:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='$(STAGING_HOST_DIR)' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
+		${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 
 
 qemu-install:
 qemu-install:
 	$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu
 	$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu

+ 10 - 6
package/qemu/patches/patch-linux-user_syscall_c

@@ -1,21 +1,25 @@
---- 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/ip.h>
  #include <netinet/tcp.h>
  #include <netinet/tcp.h>
- #include <linux/wireless.h>
 +#include <linux/version.h>
 +#include <linux/version.h>
+ #include <linux/wireless.h>
  #include <linux/icmp.h>
  #include <linux/icmp.h>
  #include "qemu-common.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/utsname.h>
  #include <linux/cdrom.h>
  #include <linux/cdrom.h>
  #include <linux/hdreg.h>
  #include <linux/hdreg.h>
++#ifdef NATIVE
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
  #include <linux/soundcard.h>
  #include <linux/soundcard.h>
 +#else
 +#else
 +#include <linux/soundcard.h.oss3>
 +#include <linux/soundcard.h.oss3>
++#endif
++#else
++#include <linux/soundcard.h>
 +#endif
 +#endif
  #include <linux/kd.h>
  #include <linux/kd.h>
  #include <linux/mtio.h>
  #include <linux/mtio.h>

+ 11 - 0
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>

+ 1 - 0
package/squashfs/Makefile

@@ -8,6 +8,7 @@ PKG_VERSION:=		4.2
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b7a781fb4cf8938842279bd3e8ee852
 PKG_MD5SUM:=		1b7a781fb4cf8938842279bd3e8ee852
 PKG_DESCR:=		squashfs filesystem utilities
 PKG_DESCR:=		squashfs filesystem utilities
+HOST_BUILDDEP:=		xz-host
 PKG_SECTION:=		fs
 PKG_SECTION:=		fs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=squashfs/}
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=squashfs/}
 
 

+ 6 - 0
scripts/scan-tools.sh

@@ -295,6 +295,11 @@ if ! which lzop >/dev/null 2>&1; then
 	host_build_lzop=1
 	host_build_lzop=1
 fi
 fi
 
 
+host_build_qemu=0
+if ! which qemu-img >/dev/null 2>&1; then
+	echo "No qemu found, will build one when required."
+	host_build_qemu=1
+fi
 
 
 echo "config ADK_HOST_BUILD_TOOLS" > $topdir/target/config/Config.in.prereq
 echo "config ADK_HOST_BUILD_TOOLS" > $topdir/target/config/Config.in.prereq
 printf "\t%s\n" "boolean" >> $topdir/target/config/Config.in.prereq
 printf "\t%s\n" "boolean" >> $topdir/target/config/Config.in.prereq
@@ -314,6 +319,7 @@ if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCAC
 if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi
+if [ $host_build_qemu -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_QEMU if ADK_HOST_NEED_QEMU" >> $topdir/target/config/Config.in.prereq ;fi
 
 
 cd $topdir
 cd $topdir
 rm -rf tmp
 rm -rf tmp

+ 0 - 1
target/arm/sys-available/acmesystems-foxg20

@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_acmesystems_foxg20
 	select ADK_acmesystems_foxg20
 	select ADK_KERNEL_AEABI
 	select ADK_KERNEL_AEABI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_TARGET_KERNEL_IMAGE

+ 0 - 1
target/arm/sys-available/cubox-i

@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_fpu_neon
 	select ADK_fpu_neon
 	select ADK_cubox_i
 	select ADK_cubox_i
 	select ADK_CPU_CORTEX_A9
 	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_INPUT

+ 0 - 1
target/arm/sys-available/raspberry-pi

@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_fpu_vfp
 	select ADK_fpu_vfp
 	select ADK_raspberry_pi
 	select ADK_raspberry_pi
 	select ADK_CPU_ARM1176JZF_S
 	select ADK_CPU_ARM1176JZF_S
-	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_INPUT

+ 2 - 38
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_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH
 	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
 endchoice
 
 
@@ -360,12 +358,6 @@ config ADK_TARGET_WITH_ACPI
 config ADK_TARGET_WITH_VGA
 config ADK_TARGET_WITH_VGA
 	boolean
 	boolean
 
 
-config ADK_TARGET_WITH_CF
-	boolean
-
-config ADK_TARGET_WITH_MMC
-	boolean
-
 config ADK_TARGET_WITH_NAND
 config ADK_TARGET_WITH_NAND
 	boolean
 	boolean
 
 
@@ -779,6 +771,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	bool "Compressed read-only root filesystem (squashfs)"
 	bool "Compressed read-only root filesystem (squashfs)"
 	select ADK_KERNEL_SQUASHFS
 	select ADK_KERNEL_SQUASHFS
 	select ADK_HOST_NEED_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
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_TARGET_WITH_MTD
 	depends on ADK_TARGET_WITH_MTD
 	help
 	help
@@ -833,35 +826,6 @@ config ADK_TARGET_ROOTFS_USB
 	help
 	help
 	  Boot system from USB stick.
 	  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
 config ADK_TARGET_ROOTFS_ISO
 	bool "ISO image"
 	bool "ISO image"
 	select ADK_KERNEL_ISO9660_FS
 	select ADK_KERNEL_ISO9660_FS
@@ -879,7 +843,7 @@ config ADK_TARGET_ROOTFS_ISO
 config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 	bool "Archive usable for initramfs creation"
 	bool "Archive usable for initramfs creation"
 	help
 	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.
 	  useful for adk-test-framework.
 
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 config ADK_TARGET_ROOTFS_ARCHIVE

+ 7 - 0
target/config/Config.in.adk

@@ -33,6 +33,13 @@ config ADK_DEBUG
 	  All packages and libc will be compiled and packaged with debug information.
 	  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.
 	  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
 config ADK_DEBUG_STRIP
 	bool "strip target binaries/libraries for gdbserver usage"
 	bool "strip target binaries/libraries for gdbserver usage"
 	depends on ADK_DEBUG
 	depends on ADK_DEBUG

+ 23 - 0
target/config/Config.in.tools

@@ -97,6 +97,14 @@ config ADK_HOST_BUILD_MKSH
 	boolean
 	boolean
 	default n
 	default n
 
 
+config ADK_HOST_NEED_QEMU
+	boolean
+	default n
+
+config ADK_HOST_BUILD_QEMU
+	boolean
+	default n
+
 config ADK_HOST_NEED_SYSLINUX
 config ADK_HOST_NEED_SYSLINUX
 	boolean
 	boolean
 	default n
 	default n
@@ -106,16 +114,31 @@ config ADK_HOST_BUILD_SYSLINUX
 	default n
 	default n
 
 
 # optional, must be used from OpenADK
 # optional, must be used from OpenADK
+config ADK_HOST_NEED_MTD_UTILS
+	boolean
+	default n
+
 config ADK_HOST_BUILD_MTD_UTILS
 config ADK_HOST_BUILD_MTD_UTILS
+	boolean
+	default y if ADK_HOST_NEED_MTD_UTILS
+	default n
+
+config ADK_HOST_NEED_SQUASHFS
 	boolean
 	boolean
 	default n
 	default n
 
 
 config ADK_HOST_BUILD_SQUASHFS
 config ADK_HOST_BUILD_SQUASHFS
+	boolean
+	default y if ADK_HOST_NEED_SQUASHFS
+	default n
+
+config ADK_HOST_NEED_MKIMAGE
 	boolean
 	boolean
 	default n
 	default n
 
 
 config ADK_HOST_BUILD_MKIMAGE
 config ADK_HOST_BUILD_MKIMAGE
 	boolean
 	boolean
+	default y if ADK_HOST_NEED_MKIMAGE
 	default n
 	default n
 
 
 config ADK_HOST_BUILD_PCRE
 config ADK_HOST_BUILD_PCRE

+ 1 - 3
target/linux/config/Config.in.fs

@@ -72,8 +72,6 @@ config ADK_KERNEL_SQUASHFS
 
 
 config ADK_KERNEL_EXT2_FS
 config ADK_KERNEL_EXT2_FS
 	boolean
 	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 y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	default n
 
 
@@ -196,7 +194,7 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_BLOCK
-	default y if ADK_TARGET_WITH_MMC
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	default n
 	help
 	help
 	  This option provides support for normal Windows file systems with
 	  This option provides support for normal Windows file systems with

+ 1 - 1
target/microblaze/Makefile

@@ -18,7 +18,7 @@ endif
 
 
 ifeq ($(ADK_TARGET_FS),squashfs)
 ifeq ($(ADK_TARGET_FS),squashfs)
 imageinstall: $(BUILD_DIR)/root.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)
 	dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 ifneq ($(ADK_HARDWARE_QEMU),)

+ 0 - 1
target/mips/sys-available/mikrotik-rb532

@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_mikrotik_rb532
 	select ADK_mikrotik_rb532
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_LEDS
 	depends on ADK_BROKEN
 	depends on ADK_BROKEN

+ 11 - 0
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).
+

+ 11 - 0
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).
+

+ 0 - 1
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_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_PCI

+ 0 - 1
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_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_BZIMAGE

+ 0 - 1
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_RTC
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	depends on ADK_BROKEN
 	help
 	help

+ 0 - 1
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_USB
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_BZIMAGE
 	depends on ADK_BROKEN
 	depends on ADK_BROKEN
 	help
 	help

+ 0 - 1
target/x86/sys-available/pcengines-wrap

@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_pcengines_wrap
 	select ADK_pcengines_wrap
 	select ADK_CPU_I486
 	select ADK_CPU_I486
 	select ADK_KERNEL_I486
 	select ADK_KERNEL_I486
-	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_BZIMAGE