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

54 files changed, 314 insertions, 70 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 8bce2ee46..992a967cf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -214,7 +214,7 @@ targethelp:
 	$(MAKE) -C target targethelp 
 
 kernelconfig:
-	${KERNEL_MAKE_ENV} ${MAKE} \
+	${KERNEL_MAKE_ENV} ${MAKE} -C "${LINUX_DIR}" \
 		ARCH=$(ADK_TARGET_ARCH) \
 		${KERNEL_MAKE_OPTS} \
 		menuconfig
diff --git a/mk/image.mk b/mk/image.mk
index 7d982d773..77d79c000 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -216,7 +216,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		-j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 37570909e..b66f71132 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -35,18 +35,18 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(ADK_TO
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 
 $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
 
 $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
 	rm -rf $(LINUX_BUILD_DIR)/modules
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 89ba10dd9..17a8d23a2 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	V=1 -C "${LINUX_DIR}" \
+KERNEL_MAKE_OPTS:=	V=1 \
 			ARCH="$(ADK_TARGET_KARCH)" \
 			CROSS_COMPILE="$(TARGET_CROSS)" \
 			CC="$(TARGET_CC)" \
diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
index e9d105be7..268aff1de 100644
--- a/package/afpfs-ng/Makefile
+++ b/package/afpfs-ng/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:=		688560de1cde57ab8d9e0ef7dc6436dbf0267fe8884f9014e50ff92b297b01a8
 PKG_DESCR:=		client for apple filing protocol
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		libgcrypt
-PKG_BUILDDEP:=		fuse libgcrypt
+PKG_BUILDDEP:=		fuse libgcrypt readline
 PKG_URL:=		https://sites.google.com/site/alexthepuffin/home
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
 PKG_LIBNAME:=		libafpclient
diff --git a/package/jq/Makefile b/package/jq/Makefile
new file mode 100644
index 000000000..d59eb8a47
--- /dev/null
+++ b/package/jq/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		jq
+PKG_VERSION:=		1.4
+PKG_RELEASE:=		1
+PKG_HASH:=		998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d
+PKG_DESCR:=		command-line json processor
+PKG_SECTION:=		sys/misc
+PKG_URL:=		http://stedolan.github.io/jq/
+PKG_SITES:=		http://stedolan.github.io/jq/download/source/
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JQ,jq,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+jq-install:
+	$(INSTALL_DIR) $(IDIR_JQ)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/jq \
+		$(IDIR_JQ)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile
index f0b3b6ed5..936d7b463 100644
--- a/package/libmpc/Makefile
+++ b/package/libmpc/Makefile
@@ -16,6 +16,8 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-lm
+
 libmpc-install:
 	${INSTALL_DIR} ${IDIR_LIBMPC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib
diff --git a/package/perf/Makefile b/package/perf/Makefile
index 75bd8efe4..a36d9bae8 100644
--- a/package/perf/Makefile
+++ b/package/perf/Makefile
@@ -28,11 +28,11 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) -C "${LINUX_DIR}" \
 		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all
 
 do-install:
-	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) \
+	$(KERNEL_MAKE_ENV) GCC_HONOUR_COPTS=0 $(MAKE) -C "${LINUX_DIR}" \
 		$(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \
 		prefix="$(WRKINST)" install
 
diff --git a/package/rt-tests/Makefile b/package/rt-tests/Makefile
new file mode 100644
index 000000000..228fcfa8a
--- /dev/null
+++ b/package/rt-tests/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		rt-tests
+PKG_VERSION:=		3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f
+PKG_RELEASE:=		1
+PKG_DESCR:=		realtime test apps
+PKG_DEPENDS:=		libpthread librt
+PKG_SECTION:=		app/debug
+PKG_SITES:=		git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RT_TESTS,rt-tests,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+XAKE_FLAGS+=		prefix=/usr
+CONFIG_STYLE:=		manual
+
+rt-tests-install:
+	$(INSTALL_DIR) $(IDIR_RT_TESTS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/cyclictest \
+		$(IDIR_RT_TESTS)/usr/bin
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 6763944c3..508b7a9d6 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		4.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs
@@ -30,6 +30,10 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--cross-compile \
 			--cross-answers=$(WRKSRC)/cache.txt \
 			--hostcc=gcc \
+			--without-pie \
+			--without-relro \
+			--without-systemd \
+			--without-automount \
 			--without-pam \
 			--without-fam \
 			--without-dmapi \
diff --git a/package/samba/patches/patch-lib_replace_wscript b/package/samba/patches/patch-lib_replace_wscript
new file mode 100644
index 000000000..a24dc099e
--- /dev/null
+++ b/package/samba/patches/patch-lib_replace_wscript
@@ -0,0 +1,11 @@
+--- samba-4.2.1.orig/lib/replace/wscript	2015-04-15 20:00:13.000000000 +0200
++++ samba-4.2.1/lib/replace/wscript	2015-04-26 10:41:27.000000000 +0200
+@@ -66,8 +66,6 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+ 
+-    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+-
+     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
+     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
diff --git a/package/samba/patches/patch-source3_lib_util_c b/package/samba/patches/patch-source3_lib_util_c
new file mode 100644
index 000000000..41b3afb06
--- /dev/null
+++ b/package/samba/patches/patch-source3_lib_util_c
@@ -0,0 +1,18 @@
+--- samba-4.2.1.orig/source3/lib/util.c	2015-01-16 09:18:39.000000000 +0100
++++ samba-4.2.1/source3/lib/util.c	2015-04-26 13:26:28.000000000 +0200
+@@ -562,6 +562,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx)
+ 	}
+ }
+ 
++#if 0
+ #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
+ /******************************************************************
+  Remove any mount options such as -rsize=2048,wsize=2048 etc.
+@@ -684,6 +685,7 @@ char *automount_lookup(TALLOC_CTX *ctx,
+ }
+ #endif /* WITH_NISPLUS_HOME */
+ #endif
++#endif
+ 
+ bool process_exists(const struct server_id pid)
+ {
diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile
new file mode 100644
index 000000000..d5f22ba97
--- /dev/null
+++ b/package/u-boot-git/Makefile
@@ -0,0 +1,78 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		u-boot-git
+PKG_VERSION:=		d8c1d5d5fb6eafbc532982125f006e49f2c40e71
+PKG_RELEASE:=		1
+PKG_DESCR:=		portable bootloader
+PKG_SECTION:=		base/boot
+HOST_BUILDDEP:=		openssl-host
+PKG_BUILDDEP:=		u-boot-host
+PKG_URL:=		http://www.denx.de/wiki/U-Boot	
+PKG_SITES:=		git://git.denx.de/u-boot.git
+
+PKG_CFLINE_U_BOOT_GIT:=	select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM
+PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro
+
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+UBOOT:=			u-boot.bin
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIG:=		rpi_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
+CONFIG:=		rpi_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y)
+CONFIG:=		atngw100_defconfig
+endif
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+CONFIG:=		Bananapro_defconfig
+UBOOT:=			u-boot-sunxi-with-spl.bin
+endif
+
+HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
+			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
+HOST_STYLE:=		manual
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+host-build:
+	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
+		$(HOST_MAKE_FLAGS) sandbox_defconfig )
+	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
+		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
+
+u-boot-git-hostinstall:
+	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
+		$(STAGING_HOST_DIR)/usr/bin
+
+do-configure:
+	(cd $(WRKBUILD) && $(MAKE) $(CONFIG))
+
+do-build:
+	(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+		GCC_HONOUR_COPTS=s $(MAKE))
+	#(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
+	#	GCC_HONOUR_COPTS=s $(MAKE) env)
+
+u-boot-git-install:
+	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
+	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/etc
+	$(CP) ./files/fw_env.config $(IDIR_U_BOOT_GIT)/etc
+	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/usr/bin
+	#$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \
+	#	$(IDIR_U_BOOT_GIT)/usr/bin
+	#(cd $(IDIR_U_BOOT_GIT)/usr/bin && ln -sf fw_printenv fw_setenv)
+	#$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT_GIT)/usr/bin
+	#$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT_GIT)/usr/bin
+
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/u-boot-git/files/fw_env.config b/package/u-boot-git/files/fw_env.config
new file mode 100644
index 000000000..5571d60e0
--- /dev/null
+++ b/package/u-boot-git/files/fw_env.config
@@ -0,0 +1 @@
+/mnt/uboot.env      0x0000          0x4000
diff --git a/package/u-boot-git/files/uboot_print_env b/package/u-boot-git/files/uboot_print_env
new file mode 100755
index 000000000..7231e1a47
--- /dev/null
+++ b/package/u-boot-git/files/uboot_print_env
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mount -r /dev/mmcblk0p1 /mnt
+fw_printenv "$@"
+umount /mnt
diff --git a/package/u-boot-git/files/uboot_set_env b/package/u-boot-git/files/uboot_set_env
new file mode 100755
index 000000000..7b5a33ccc
--- /dev/null
+++ b/package/u-boot-git/files/uboot_set_env
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mount /dev/mmcblk0p1 /mnt
+fw_setenv "$@"
+umount /mnt
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 3d4681678..3bc67d76c 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -4,17 +4,29 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
-PKG_VERSION:=		2.2.0
+PKG_VERSION:=		2.2.1
 PKG_RELEASE:=		1
-PKG_HASH:=		5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517
+PKG_HASH:=		543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
 PKG_DESCR:=		popular media player
 PKG_SECTION:=		mm/video
 PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt libmad alsa-lib
-PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt alsa-lib
+PKG_DEPENDS:=		libpthread librt libffmpeg xcb-util libtheora libgcrypt alsa-lib
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
-PKG_LIBC_DEPENDS:=	glibc musl
+PKG_FLAVOURS_VLC:=	WITH_BLURAY WITH_OPUS WITH_SPEEX WITH_THEORA
+PKGFD_WITH_BLURAY:=	enable bluray support
+PKGFB_WITH_BLURAY:=	libbluray
+PKGFS_WITH_BLURAY:=	libbluray
+PKGFD_WITH_OPUS:=	enable opus support
+PKGFB_WITH_OPUS:=	opus
+PKGFS_WITH_OPUS:=	libopus
+PKGFD_WITH_SPEEX:=	enable speex support
+PKGFB_WITH_SPEEX:=	speex
+PKGFS_WITH_SPEEX:=	libspeex
+PKGFD_WITH_THEORA:=	enable theora support
+PKGFB_WITH_THEORA:=	libtheora
+PKGFS_WITH_THEORA:=	libtheora
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -27,21 +39,42 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--disable-dbus \
 			--disable-a52 \
 			--disable-fribidi \
-			--disable-qt4 \
 			--disable-skins2 \
 			--disable-dvdnav \
-			--disable-glx \
 			--disable-libxml2 \
-			--disable-smb \
 			--disable-xcb \
 			--without-kde-solid \
 			--enable-libgcrypt \
 			--enable-mad \
-			--enable-theora \
 			--disable-optimizations \
 			--disable-static \
 			--disable-avcodec
 
+ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),)
+CONFIGURE_ARGS+=	--disable-neon
+endif
+
+ifneq ($(ADK_PACKAGE_VLC_WITH_BLURAY),)
+CONFIGURE_ARGS+=	--enable-libbluray
+else
+CONFIGURE_ARGS+=	--disable-libbluray
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_OPUS),)
+CONFIGURE_ARGS+=	--enable-opus
+else
+CONFIGURE_ARGS+=	--disable-opus
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_SPEEX),)
+CONFIGURE_ARGS+=	--enable-speex
+else
+CONFIGURE_ARGS+=	--disable-speex
+endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_THEORA),)
+CONFIGURE_ARGS+=	--enable-theora
+else
+CONFIGURE_ARGS+=	--disable-theora
+endif
+
 vlc-install:
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/bin
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/lib/vlc/plugins
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
deleted file mode 100644
index 59643a5b3..000000000
--- a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- vlc-2.1.1.orig/modules/misc/inhibit/xdg.c	2013-06-24 20:00:38.000000000 +0200
-+++ vlc-2.1.1/modules/misc/inhibit/xdg.c	2013-12-06 19:42:43.000000000 +0100
-@@ -28,7 +28,6 @@
- #include <assert.h>
- #include <errno.h>
- #include <signal.h>
--#include <spawn.h>
- #include <sys/wait.h>
- 
- static int Open (vlc_object_t *);
diff --git a/package/vlc/patches/patch-src_posix_error_c b/package/vlc/patches/patch-src_posix_error_c
new file mode 100644
index 000000000..3e720ec00
--- /dev/null
+++ b/package/vlc/patches/patch-src_posix_error_c
@@ -0,0 +1,14 @@
+--- vlc-2.2.1.orig/src/posix/error.c	2014-08-14 02:20:04.000000000 -0500
++++ vlc-2.2.1/src/posix/error.c	2015-04-25 21:13:22.287684003 -0500
+@@ -48,7 +48,11 @@ static const char *vlc_strerror_l(int er
+         errno = saved_errno;
+     }
+ 
++#if defined(__UCLIBC__)
++    const char *buf = strerror_r(errnum, loc, 100);
++#else
+     const char *buf = strerror_l(errnum, loc);
++#endif
+ 
+     freelocale(loc);
+     return buf;
diff --git a/scripts/install.sh b/scripts/install.sh
index 7df634213..6d27c4854 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -142,7 +142,7 @@ tgt=$2
 src=$3
 
 case $target {
-(raspberry-pi|raspberry-pi2|solidrun-imx6|default) ;;
+(banana-pro|raspberry-pi|raspberry-pi2|solidrun-imx6|default) ;;
 (*)
 	print -u2 "Unknown target '$target', exiting"
 	exit 1 ;;
@@ -499,6 +499,9 @@ dd if="$T/firsttrack" of="$tgt" > /dev/null 2>&1
 fwdir=$(dirname "$src")
 
 case $target {
+(banana-pro)
+	dd if="$fwdir/u-boot-sunxi-with-spl.bin" of="$tgt" bs=1024 seek=8 > /dev/null 2>&1
+	;;
 (solidrun-imx6)
 	dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1
 	dd if="$fwdir/u-boot.img" of="$tgt" bs=1024 seek=42 > /dev/null 2>&1
@@ -523,7 +526,7 @@ if (( datafssz )); then
 	(raspberry-pi|raspberry-pi2)
 		echo "/dev/mmcblk0p3	/data	ext4	rw	0	0" >> "$R"/etc/fstab 
 	;;
-	(solidrun-imx6)
+	(banana-pro|solidrun-imx6)
 		echo "/dev/mmcblk0p2	/data	ext4	rw	0	0" >> "$R"/etc/fstab
 	;;
 	}
diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm
index abd335767..441e0c66c 100644
--- a/target/aarch64/systems/arm-fm
+++ b/target/aarch64/systems/arm-fm
@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_ARM_FM
 	bool "ARMv8 Foundation Model"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A57
-	select ADK_LINUX_64
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64
index 4d455beb7..6e0092b1d 100644
--- a/target/aarch64/systems/qemu-aarch64
+++ b/target/aarch64/systems/qemu-aarch64
@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_AARCH64
 	bool "Qemu Emulator"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_CORTEX_A57
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_IMAGE
 	help
diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64
index c53324d22..b23b056df 100644
--- a/target/aarch64/systems/toolchain-aarch64
+++ b/target/aarch64/systems/toolchain-aarch64
@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
 	bool "Toolchain only"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_CORTEX_A57
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/alpha/systems/qemu-alpha b/target/alpha/systems/qemu-alpha
index 74684c047..8c540d2e2 100644
--- a/target/alpha/systems/qemu-alpha
+++ b/target/alpha/systems/qemu-alpha
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_ALPHA
 	bool "Qemu Emulator"
-	select ADK_LINUX_64
 	select ADK_CPU_ALPHA
 	select ADK_TARGET_QEMU
 	help
diff --git a/target/alpha/systems/toolchain-alpha b/target/alpha/systems/toolchain-alpha
index 78abdad98..efa21c747 100644
--- a/target/alpha/systems/toolchain-alpha
+++ b/target/alpha/systems/toolchain-alpha
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ALPHA
 	bool "Toolchain only"
-	select ADK_LINUX_64
 	select ADK_CPU_ALPHA
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 0e7441090..6b2a8ee79 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -55,6 +55,12 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
 	@echo "Use following command to install with a writable data partition"
 	@echo "sudo ./scripts/install.sh -d 256 raspberry-pi2 /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+	@echo "Use following command to install it on SD card:"
+	@echo "sudo ./scripts/install.sh banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "Use following command to install with a writable data partition"
+	@echo "sudo ./scripts/install.sh -d 256 banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
+endif
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 ifeq ($(ADK_APPLIANCE_KODI),y)
 	@echo "Use following command to install with a writable data partition"
@@ -114,13 +120,13 @@ kernel-install: kernel-strip
 
 dtb-install:
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE)
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE)
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE)
 endif
 	for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \
diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro
new file mode 100644
index 000000000..c06104359
--- /dev/null
+++ b/target/arm/kernel/banana-pro
@@ -0,0 +1,7 @@
+CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_SUN7I=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_SUNXI=y
diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro
new file mode 100644
index 000000000..d4e687a92
--- /dev/null
+++ b/target/arm/systems/banana-pro
@@ -0,0 +1,19 @@
+config ADK_TARGET_SYSTEM_BANANA_PRO
+	bool "Banana Pro"
+	select ADK_CPU_CORTEX_A7
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_WITH_NEON
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_SERIAL
+	select ADK_TARGET_WITH_CPU_FREQ
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_SD
+	select ADK_TARGET_WITH_I2C
+	select ADK_TARGET_WITH_SPI
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_PACKAGE_U_BOOT_GIT
+	help
+	  Banana Pro
diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2
index 1133eb00b..9fb12ee34 100644
--- a/target/arm/systems/linksys-nslu2
+++ b/target/arm/systems/linksys-nslu2
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	bool "Linksys NSLU2"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_XSCALE
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
index 049b4dcac..96f2fe1f5 100644
--- a/target/arm/systems/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_ARM1176JZF_S
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2
index 702aae0f5..da6a8265c 100644
--- a/target/arm/systems/raspberry-pi2
+++ b/target/arm/systems/raspberry-pi2
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	bool "Raspberry PI 2"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A7
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus
index 568b41865..ee18de579 100644
--- a/target/arm/systems/sharp-zaurus
+++ b/target/arm/systems/sharp-zaurus
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	bool "Sharp Zaurus CL3200 (Terrier)"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_WITH_IWMMXT
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6
index ae32b3a1b..acc5ccc78 100644
--- a/target/arm/systems/solidrun-imx6
+++ b/target/arm/systems/solidrun-imx6
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	bool "Solidrun IMX6 Embedded Systems"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_CPU_FREQ
diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100
index 1ed2d216e..4433184fa 100644
--- a/target/avr32/systems/atmel-ngw100
+++ b/target/avr32/systems/atmel-ngw100
@@ -1,9 +1,9 @@
 config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	bool "Atmel NGW100"
 	select ADK_CPU_AVR32
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_HOST_BUILD_U_BOOT
-	select ADK_TARGET_WITH_SERIAL
 	help
 	  Atmel NGW100
 
diff --git a/target/c6x/systems/toolchain-c6x b/target/c6x/systems/toolchain-c6x
index 02ac571ec..78093e92d 100644
--- a/target/c6x/systems/toolchain-c6x
+++ b/target/c6x/systems/toolchain-c6x
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_C6X
 	bool "Toolchain only"
-	select ADK_TARGET_UCLINUX
 	select ADK_CPU_C6X
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 37d6968c8..98b060616 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -4,11 +4,13 @@
 # CPU
 config ADK_CPU_ALPHA
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_AMDFAM10
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
@@ -36,11 +38,13 @@ config ADK_CPU_ARM926EJ_S
 
 config ADK_CPU_ARMV8
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_ATHLON
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -114,11 +118,13 @@ config ADK_CPU_CORTEX_A15
 
 config ADK_CPU_CORTEX_A53
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_CORTEX_A57
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -152,6 +158,7 @@ config ADK_CPU_I686
 
 config ADK_CPU_LOONGSON2F
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -176,11 +183,13 @@ config ADK_CPU_MIPS32R2
 
 config ADK_CPU_MIPS64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_MIPS64R2
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -217,6 +226,7 @@ config ADK_CPU_PPC_440
 
 config ADK_CPU_PPC64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -232,6 +242,7 @@ config ADK_CPU_SPARC_V8
 
 config ADK_CPU_SPARC_V9
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -247,6 +258,7 @@ config ADK_CPU_X86
 
 config ADK_CPU_X86_64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index 8e96264d0..0495a75ef 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -74,4 +74,4 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100
 	default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI
 	default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER
-
+	default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO
diff --git a/target/m68k/systems/qemu-m68k b/target/m68k/systems/qemu-m68k
index a33a1b729..a8f35ee3b 100644
--- a/target/m68k/systems/qemu-m68k
+++ b/target/m68k/systems/qemu-m68k
@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_QEMU_M68K
 	bool "Qemu M68K"
 	select ADK_CPU_CF_5208
-	select ADK_TARGET_QEMU
 	select ADK_TARGET_UCLINUX
+	select ADK_TARGET_QEMU
 	select ADK_TARGET_BINFMT_FLAT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s
index 112e2cd01..67fec9b50 100644
--- a/target/mips/systems/dragino-ms14s
+++ b/target/mips/systems/dragino-ms14s
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	bool "Dragino2 ms14-s"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx
index 87886524a..3954738f4 100644
--- a/target/mips/systems/mikrotik-rb4xx
+++ b/target/mips/systems/mikrotik-rb4xx
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	bool "Mikrotik Routerboard 4xx"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_WATCHDOG
diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532
index 55688d288..1fe4159fc 100644
--- a/target/mips/systems/mikrotik-rb532
+++ b/target/mips/systems/mikrotik-rb532
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	bool "Mikrotik Routerboard 532"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong
index bdb835fab..2a01dff07 100644
--- a/target/mips64/systems/lemote-yeelong
+++ b/target/mips64/systems/lemote-yeelong
@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	bool "Lemote Yeelong laptop"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_LOONGSON2F
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_VGA
diff --git a/target/mips64/systems/qemu-mips64 b/target/mips64/systems/qemu-mips64
index feffc6322..eda927cfd 100644
--- a/target/mips64/systems/qemu-mips64
+++ b/target/mips64/systems/qemu-mips64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	bool "Qemu Emulator"
 	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
diff --git a/target/mips64/systems/toolchain-mips64 b/target/mips64/systems/toolchain-mips64
index 89cf048b2..5b92b796a 100644
--- a/target/mips64/systems/toolchain-mips64
+++ b/target/mips64/systems/toolchain-mips64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
 	bool "Toolchain only"
 	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 9a5529642..2f9ed8bf1 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -71,7 +71,7 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 
 dtb-install:
-	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
+	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		-j${ADK_MAKE_JOBS} virtex440-ml507.dtb $(MAKE_TRACE)
 	$(CP) $(LINUX_DIR)/arch/powerpc/boot/virtex440-ml507.dtb \
 		$(FW_DIR)/ppc.dtb
diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64
index 29038a6a4..cee9c5a6c 100644
--- a/target/ppc64/systems/qemu-ppc64
+++ b/target/ppc64/systems/qemu-ppc64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_PPC64
 	bool "Qemu Emulator"
 	select ADK_CPU_PPC64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	help
 	 Support for Qemu Emulator PPC64 architecture.
diff --git a/target/ppc64/systems/toolchain-ppc64 b/target/ppc64/systems/toolchain-ppc64
index 3bac81c5e..389c71007 100644
--- a/target/ppc64/systems/toolchain-ppc64
+++ b/target/ppc64/systems/toolchain-ppc64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	bool "Toolchain only"
 	select ADK_CPU_PPC64
-	select ADK_LINUX_64
 	select ADK_TAGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/sparc64/systems/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64
index f8be214a1..9079671dc 100644
--- a/target/sparc64/systems/qemu-sparc64
+++ b/target/sparc64/systems/qemu-sparc64
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	bool "Qemu Emulator"
-	select ADK_LINUX_64
 	select ADK_CPU_SPARC_V9
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/sparc64/systems/toolchain-sparc64 b/target/sparc64/systems/toolchain-sparc64
index f6b62d285..9a86635bf 100644
--- a/target/sparc64/systems/toolchain-sparc64
+++ b/target/sparc64/systems/toolchain-sparc64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	bool "Toolchain only"
 	select ADK_CPU_SPARC_V9
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu
index 980a87265..6159eda1c 100644
--- a/target/x86_64/systems/pcengines-apu
+++ b/target/x86_64/systems/pcengines-apu
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_PCENGINES_APU
 	bool "PC Engines APU"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/x86_64/systems/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64
index ad051030e..1c96e03d5 100644
--- a/target/x86_64/systems/qemu-x86_64
+++ b/target/x86_64/systems/qemu-x86_64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_X86_64
 	bool "Qemu Emulator"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	help
diff --git a/target/x86_64/systems/toolchain-x86_64 b/target/x86_64/systems/toolchain-x86_64
index 31fb45964..de11ff163 100644
--- a/target/x86_64/systems/toolchain-x86_64
+++ b/target/x86_64/systems/toolchain-x86_64
@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	bool "Toolchain only"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 6285b2af6..caa4b2437 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -135,10 +135,9 @@ endif
 endif
 
 ifeq ($(ADK_TARGET_ARCH_X86_64),y)
-ifeq ($(ADK_TARGET_ABI_X32),y)
+ifneq ($(ADK_TARGET_ABI_X32),)
 GCC_FINAL_CONFOPTS+=	--with-abi=x32
-endif
-ifeq ($(ADK_TARGET_ABI_64),y)
+else
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
 endif
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index c7c7eefef..1d206c4c1 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -40,8 +40,8 @@ endif
 	touch $@
 
 $(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
-	$(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) headers_check
-	$(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
+	$(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) headers_check
+	$(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
 		headers_install
 ifeq ($(ADK_TARGET_ARCH_CRIS),y)