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

23 files changed, 56 insertions, 129 deletions

diff --git a/BUGS b/BUGS
index 528b590cf..70759ad05 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,5 @@
-- arm: thumb mode with glibc does not boot
-- sparc64: ide driver not working, only virtio (but unstable)
-- microblaze big endian: network card emulation fails
+- qemu-sparc: startup kernel with gcc 4.8.2 broken
+- qemu-sh4: usb keyboard is broken
+- qemu-arm: thumb mode with glibc does not boot
+- qemu-sparc64: ide driver not working, only virtio (but unstable)
+- qemu-microblaze: network card emulation fails, little endian works
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 66feea33c..3d70120d1 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -38,7 +38,7 @@ ifneq ($(filter manual,${CONFIG_STYLE}),)
 	env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
 else ifneq ($(filter minimal,${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
-	@cd ${WRKBUILD}; \
+	@cd ${WRKSRC}; \
 	    for i in $$(find . -name config.sub);do \
 		if [ -f $$i ]; then \
 			${CP} $$i $$i.bak; \
@@ -57,7 +57,7 @@ else ifneq ($(filter minimal,${CONFIG_STYLE}),)
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
 else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
-	@cd ${WRKBUILD}; \
+	@cd ${WRKSRC}; \
 	    for i in $$(find . -name config.sub);do \
 		if [ -f $$i ]; then \
 			${CP} $$i $$i.bak; \
diff --git a/package/ant/Makefile b/package/ant/Makefile
index 625853bd8..b5b7d86b9 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		ant utility
 PKG_SECTION:=		lang
 PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 
+PKG_CFLINE_ANT:=	depends on ADK_HOST_ONLY
+
 DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 6cdf53b0b..c444eba19 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,13 +12,12 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_CFLINE_CMAKE:=	depends on ADK_BROKEN
+PKG_CFLINE_CMAKE:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
@@ -35,13 +34,5 @@ cmake-hostinstall:
 	$(INSTALL_BIN) $(WRKBUILD)/bin/cmake \
 		$(STAGING_HOST_DIR)/usr/bin
 
-do-configure:
-	(cd $(WRKBUILD); ./configure --prefix=/usr)
-
-cmake-install:
-	$(INSTALL_DIR) $(IDIR_CMAKE)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/cmake \
-		$(IDIR_CMAKE)/usr/bin
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 8e4dc6f94..8bba31865 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -10,6 +10,8 @@ PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
 PKG_DESCR:=		ecj java compiler
 PKG_SECTION:=		lang
 
+PKG_CFLINE_ECJ:=	depends on ADK_HOST_ONLY
+
 NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/host.mk
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index 0f4c1a50c..fe73820fa 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
+PKG_CFLINE_FASTJAR:=	depends on ADK_HOST_ONLY
+
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 15c56b204..8273f06b2 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		GNU java compiler
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 
+PKG_CFLINE_GCJ:=	depends on ADK_HOST_ONLY
+
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
 
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index b483b838c..a09dc3be5 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gettext-tiny
-PKG_VERSION:=		0.0.3
+PKG_VERSION:=		0.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:=		09f6a74945df5961080234f7851f352c
 PKG_DESCR:=		Gettext stub and replacement
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		gettext-tiny-host
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 6289c1cb8..4a332b32e 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
+PKG_CFLINE_RUBY_LDAP:=	depends on ADK_BROKEN
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/scons/Makefile b/package/scons/Makefile
index 3f8958d40..9e92c9917 100644
--- a/package/scons/Makefile
+++ b/package/scons/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		bzip2-host python2-host
 PKG_URL:=		http://www.scons.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=scons/}
 
-PKG_ARCH_DEPENDS:=	native
+PKG_CFLINE_SCONS:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
deleted file mode 100644
index 99c721879..000000000
--- a/package/upower/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		upower
-PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:=		powermanagement
-PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit eudev
-PKG_DEPENDS:=		glib dbus-glib polkit libgudev
-PKG_URL:=		http://upower.freedesktop.org/
-PKG_SITES:=		http://upower.freedesktop.org/releases/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--without-systemdutildir \
-			--disable-rpath
-
-upower-install:
-	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_UPOWER)/etc
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
-		$(IDIR_UPOWER)/usr/lib
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
-		$(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
-		$(IDIR_UPOWER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
-	$(CP) $(WRKINST)/usr/share/dbus-1/* \
-		$(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
deleted file mode 100644
index 7709ee096..000000000
--- a/package/upower/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- 	HACKING 			\
- 	ChangeLog
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index a7883cb24..c16aff609 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -37,8 +37,9 @@ if [[ -e foo ]]; then
 		Darwin*)
 			echo "Building OpenADK on $os needs a case-sensitive disk partition."
 			echo "For Snow Leopard and above you can use diskutil to resize your existing disk."
-			echo "For older versions you might consider to use a disk image."
 			echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G"
+			echo "For older versions you might consider to use a disk image:"
+			echo "hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 30g ~/openadk.dmg"
 			;;
 	esac
 	exit 1
diff --git a/target/config/Config.in b/target/config/Config.in
index 5c5f1b6fd..c50fbd289 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -241,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_INPUT_MOUSE
 	select ADK_KERNEL_INPUT_MOUSEDEV
+	select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 
 endchoice
 
@@ -619,6 +620,7 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686
+	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC
 	default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 03cecfca1..3634564ed 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && ADK_TARGET_QEMU_WITH_GRAPHIC
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_RUNTIME_CONSOLE_SERIAL
 
 config ADK_RUNTIME_CONSOLE_VGA
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 17c23b65c..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_USB_HID
+	boolean
+	default n
+
 config ADK_KERNEL_HID_LOGITECH
 	boolean
 	default n
@@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
 config ADK_KPACKAGE_KMOD_USB_HID
 	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
 	tristate
+	depends on !ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_HID_GENERIC
@@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n
 
 config ADK_KERNEL_LOGITECH_DINOVO
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b2c750673..f6fd22339 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,11 +1,23 @@
 menu "USB support"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
 
 config ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB
 	select ADK_KERNEL_USB_SUPPORT
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/sh/Makefile b/target/sh/Makefile
index da733acac..3cf65f614 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -8,6 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage
+QEMU_ARGS:=${ADK_QEMU_ARGS} -monitor null -serial null -serial stdio
 
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@@ -18,7 +19,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -28,7 +29,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -37,6 +38,6 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
diff --git a/target/x86/Makefile b/target/x86/Makefile
index f55c97e47..91c9cef17 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -34,7 +34,7 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 ifeq ($(ADK_HARDWARE_VBOX),y)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
@@ -54,7 +54,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -63,7 +63,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq (${ADK_TARGET_FS},iso)
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index 0d0d213d4..596f2923f 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -17,7 +17,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),usb)
@@ -32,7 +32,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -41,7 +41,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
diff --git a/target/x86_64/sys-available/shuttle-sa76 b/target/x86_64/sys-available/shuttle-sa76
deleted file mode 100644
index 557cc77cd..000000000
--- a/target/x86_64/sys-available/shuttle-sa76
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_SHUTTLE_SA76
-	bool "Shuttle SA76"
-	depends on ADK_BROKEN
-	select ADK_x86_64
-	select ADK_shuttle_sa76
-	select ADK_CPU_AMDFAM10
-	select ADK_LINUX_64
-	select ADK_KERNEL_SMP
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_SATA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_USB_BOOT
-	help
-	 Support for Shuttle SA76 XPC.
diff --git a/target/x86_64/sys-available/tarox-pc b/target/x86_64/sys-available/tarox-pc
deleted file mode 100644
index d6b068e06..000000000
--- a/target/x86_64/sys-available/tarox-pc
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_TARGET_SYSTEM_TAROX_PC
-	bool "Tarox PC"
-	depends on ADK_BROKEN
-	select ADK_x86_64
-	select ADK_tarox_pc
-	select ADK_LINUX_64
-	select ADK_KERNEL_SMP
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_SATA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_USB_BOOT
-	help
-	 Support for Tarox Business PC.
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
index a6ee57906..2c912e52b 100644
--- a/tools/mksh/Makefile
+++ b/tools/mksh/Makefile
@@ -18,7 +18,6 @@ install: ${STAGING_HOST_DIR}/usr/bin/mksh
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
 	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
-	    CPPFLAGS='${CPPFLAGS_FOR_BUILD}' LDFLAGS='${LDFLAGS_FOR_BUILD}' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
 	touch $@