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

28 files changed, 145 insertions, 50 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 2a3bf2d34..da78089e2 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -123,9 +123,13 @@ world:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
+ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
 else
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install
+endif
+else
 	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
@@ -214,7 +218,7 @@ clean:
 	@$(TRACE) clean
 	$(MAKE) -C $(CONFIG) clean
 	for d in ${STAGING_PKG_DIR}; do \
-		for f in $$(ls $$d/[a-z]*|grep -v [A-Z] 2>/dev/null); do  \
+		for f in $$(ls $$d/[a-z]* 2>/dev/null |grep -v [A-Z] 2>/dev/null); do  \
 			while read file ; do \
 				rm ${STAGING_DIR}/$$file 2>/dev/null;\
 			done < $$f ; \
@@ -513,7 +517,7 @@ bulk:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=nfsroot defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 346a26fc9..e726b14da 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -8,10 +8,14 @@ KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 			HOSTCFLAGS='${CFLAGS_FOR_BUILD}'
 endif
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000
+ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
+			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \
+			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000
+ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
+			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \
+			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 
 KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}'
diff --git a/mk/vars.mk b/mk/vars.mk
index 7b9bbe462..a7c6e30b3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -79,12 +79,6 @@ TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_LDFLAGS:=
 endif
 
-ifneq ($(ADK_STATIC),)
-TARGET_CFLAGS+=		-static
-TARGET_CXXFLAGS+=	-static
-TARGET_LDFLAGS+=	-static
-endif
-
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 8ee6641c6..63f6d916f 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a07a97cfb28b588cbcf83ffa9ec92e3f
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		jpeg libtiff fontconfig libiconv
+PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
 PKG_NEED_CXX:=		1
@@ -46,6 +46,10 @@ CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
 			--without-lcms \
 			--without-lcms2 \
 			--without-wmf \
+			--without-xml \
+			--with-jpeg \
+			--with-png \
+			--with-tiff \
 			--enable-fast-install
 
 libimagemagick-install:
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 57f394c0d..bec5fe6e6 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -15,7 +15,7 @@ PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU)
+PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_HARDWARE_QEMU)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 9f2c54702..f9f89576c 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:=	x86 x86_64
 
 PKG_CFLINE_GRUB_BIN:=	select BUSYBOX_FEATURE_STAT_FORMAT@
 PKG_CFLINE_GRUB_BIN+=	depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY
+PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index a92899818..2c1689069 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,5 +1,5 @@
 --- libX11-1.4.0.orig/src/util/Makefile.in	2010-11-21 23:15:55.000000000 +0100
-+++ libX11-1.4.0/src/util/Makefile.in	2011-01-24 16:37:00.000000000 +0100
++++ libX11-1.4.0/src/util/Makefile.in	2011-04-28 22:56:41.000000000 +0200
 @@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -8,3 +8,18 @@
  	$(CWARNFLAGS)
  
  EXTRA_DIST = mkks.sh
+@@ -351,12 +350,12 @@ distclean-compile:
+ @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ makekeys-makekeys.o: makekeys.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
+ @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
+ 
+ makekeys-makekeys.obj: makekeys.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 19e9325a4..bdf1c54c8 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -13,9 +13,13 @@ PKG_BUILDDEP:=		xproto xextproto libXext
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index fb8011912..4aa9a16b2 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -16,15 +16,19 @@ PKG_SUBPKGS:=		LIBLZO LIBLZO_DEV
 PKGSD_LIBLZO_DEV:=	lzo library headers
 PKGSC_LIBLZO_DEV:=	devel
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV}))
+$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV},$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--enable-static
 MAKE_FLAGS+=		CFLAGS_O="${TARGET_CFLAGS}"
 
-liblzo-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 64a71f7d8..0ce3b3f52 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -75,6 +75,11 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+TARGET_LDFLAGS+=	-static
+endif
+
 openssh-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
 	chmod 0700 ${IDIR_OPENSSH}/etc/ssh
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 83d538537..cf7d657fa 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -25,9 +25,13 @@ PKGSS_LIBOPENSSL_DEV:=	libopenssl
 PKG_FLAVOURS_LIBOPENSSL:=	WITH_EC
 PKGFD_WITH_EC:=			enable Elliptic Curve crypto
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL}))
 
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 7cdacf554..623025f79 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -41,7 +41,6 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-libblkid \
 			--enable-libmount \
 			--enable-mount
-MAKE_FLAGS+=		OPT="${TARGET_CFLAGS}" ARCH="${ARCH}"
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -lintl
 
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
new file mode 100644
index 000000000..74e01e1f7
--- /dev/null
+++ b/package/x11vnc/Makefile
@@ -0,0 +1,32 @@
+# 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:=		x11vnc
+PKG_VERSION:=		0.9.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1498a68d02aa7b6c97bf746c073c8d00
+PKG_DESCR:=		VNC server for X11 displays
+PKG_SECTION:=		x11/apps
+PKG_BUILDDEP:=		libX11 libXtst
+PKG_URL:=		http://www.karlrunge.com/x11vnc/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq ($(ADK_STATIC),y)
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} -static" \
+			LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
+endif
+
+CONFIGURE_ARGS+=	--without-ssl
+
+x11vnc-install:
+	$(INSTALL_DIR) $(IDIR_X11VNC)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/x11vnc \
+		$(IDIR_X11VNC)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
index cf47ce9b4..2b3ee6aea 100644
--- a/package/xinit/patches/patch-startx_cpp
+++ b/package/xinit/patches/patch-startx_cpp
@@ -20,12 +20,3 @@
  
      authdisplay=${display:-:0}
  #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
-@@ -347,5 +336,8 @@ screenrestore
- kbd_mode -a
- #endif
- 
-+xset dpms 0 0 60
-+xset s 0
-+
- exit $retval
- 
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 24b7d3b11..c94c0dcf3 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -38,6 +38,8 @@ ifeq ($(ADK_STATIC),)
 CONFIGURE_OPTS:=	--shared
 endif
 
+ALL_TARGET:=		libz.a libz.so.1.2.5
+
 do-configure:
 	(cd $(WRKBUILD); $(COPTS) \
 		uname="Linux" \
@@ -49,7 +51,7 @@ do-configure:
 		$(CONFIGURE_OPTS) \
 	);
 
-zlib-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
 	${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
 
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 1cc93db5b..a5e31c711 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	bool "Toolchain only"
 	select ADK_arm
 	select ADK_toolchain_arm
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
 	help
diff --git a/target/config/Config.in b/target/config/Config.in
index 453c894a3..8697f337e 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -12,12 +12,26 @@ config ADK_TARGET_ENDIAN
 	default "little" if ADK_little
 	default "big" if ADK_big
 
+config ADK_TOOLCHAIN
+	boolean
+
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
 
 choice
+prompt "Toolchain options"
+depends on ADK_TOOLCHAIN
+config ADK_TOOLCHAIN_ONLY
+	boolean "Only build toolchain and selected packages"
+
+config ADK_TOOLCHAIN_ARCHIVE
+	boolean "Build a complete system usable f.e. via chroot"
+
+endchoice
+
+choice
 prompt "Target Endianess"
-depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN_ONLY
+depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN
 config ADK_ENDIAN
         boolean "Choose target endianess"
 
@@ -382,7 +396,7 @@ config ADK_TARGET_SUFFIX
 
 choice
 prompt "Target firmware type"
-depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN_ONLY
+depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN
 default ADK_TARGET_ROOTFS_ARCHIVE
 
 config ADK_TARGET_ROOTFS_INITRAMFS
diff --git a/target/cris/sys-available/toolchain-cris b/target/cris/sys-available/toolchain-cris
index 309b85d55..cef2d17c2 100644
--- a/target/cris/sys-available/toolchain-cris
+++ b/target/cris/sys-available/toolchain-cris
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS
 	bool "Toolchain only"
 	select ADK_cris
 	select ADK_toolchain_cris
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a cris toolchain.
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index f942046ac..590a466c4 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -343,6 +343,18 @@ config ADK_KERNEL_ATH5K_DEBUG
 config ADK_KPACKAGE_KMOD_B43
 	prompt "kmod-b43..................... Broadcom B43xx wireless cards"
 	tristate
+	select ADK_PACKAGE_B43_FIRMWARE
+	select ADK_KPACKAGE_KMOD_FW_LOADER
+	select ADK_KPACKAGE_KMOD_MAC80211
+	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
+	default n
+	help
+	  Driver for Broadcom B43xx wireless chips.
+
+config ADK_KPACKAGE_KMOD_B43LEGACY
+	prompt "kmod-b43legacy............... Broadcom B43xx (legacy) wireless cards"
+	tristate
+	select ADK_PACKAGE_B43_FIRMWARE
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
diff --git a/target/linux/patches/2.6.37/brcm.patch b/target/linux/patches/2.6.37/brcm.patch
index c484dc838..e1f0ecbde 100644
--- a/target/linux/patches/2.6.37/brcm.patch
+++ b/target/linux/patches/2.6.37/brcm.patch
@@ -9,8 +9,8 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bc
 +obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o
 diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/bcm47xx/platform.c
 --- linux-2.6.37.orig/arch/mips/bcm47xx/platform.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37/arch/mips/bcm47xx/platform.c	2011-04-26 21:54:17.727672777 +0200
-@@ -0,0 +1,147 @@
++++ linux-2.6.37/arch/mips/bcm47xx/platform.c	2011-04-27 09:51:38.177664121 +0200
+@@ -0,0 +1,146 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -28,7 +28,6 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +#include <asm/mach-bcm47xx/bcm47xx.h>
 +#include <asm/mach-bcm47xx/nvram.h>
 +
-+#define NVRAM_FLASH_SIZE 0x10000
 +#define CFGFS_FLASH_SIZE (128 * 1024)
 +
 +static struct mtd_partition bcm47xx_partitions[] = {
@@ -36,8 +35,8 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +	{
 +		.name       = "cfe",
 +		.offset     = 0,
-+		.size       = 0x40000,		/* 256k */
-+		.mask_flags = MTD_WRITEABLE	/* force read-only */
++		.size       = BCM47XX_OVERRIDE_CFESIZE,
++		.mask_flags = MTD_WRITEABLE		/* force read-only */
 +	},
 +#define SLOT_LINUX 1
 +	{
@@ -108,7 +107,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +	struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
 +	struct bcm47xx_trx_header *trx_hdr;
 +
-+	trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + 0x40000);
++	trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + BCM47XX_OVERRIDE_CFESIZE);
 +
 +	/* devices might have 2, 4 or 8 MB flash size */
 +#ifdef BCM47XX_OVERRIDE_FLASHSIZE
@@ -122,11 +121,11 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +	printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE,
 +		flash_size);
 +
-+	left = flash_size - 0x40000;
++	left = flash_size - BCM47XX_OVERRIDE_CFESIZE;
 +	posn = flash_size;
-+	UPTODOWN(SLOT_NVRAM, NVRAM_FLASH_SIZE);
++	UPTODOWN(SLOT_NVRAM, BCM47XX_OVERRIDE_NVRAMSIZE);
 +	UPTODOWN(SLOT_CFGFS, CFGFS_FLASH_SIZE);
-+	bcm47xx_partitions[SLOT_LINUX].offset = 0x40000;
++	bcm47xx_partitions[SLOT_LINUX].offset = BCM47XX_OVERRIDE_CFESIZE;
 +	bcm47xx_partitions[SLOT_LINUX].size = left;
 +
 +	if (trx_hdr->magic == BCM47XX_TRX_MAGIC) {
diff --git a/target/mips/Makefile b/target/mips/Makefile
index abb98a107..5c2dad231 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -49,6 +49,14 @@ ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
 kernel-install:
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB411),y)
+kernel-install:
+	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel
+endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y)
+kernel-install:
+	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel
+endif
 
 ifeq ($(ADK_TARGET_FS),nfsroot)
 imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips
index e2f4bc39e..d07306ee8 100644
--- a/target/mips/sys-available/toolchain-mips
+++ b/target/mips/sys-available/toolchain-mips
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
 	bool "Toolchain only"
 	select ADK_mips
 	select ADK_toolchain_mips
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  MIPS toolchain.
 
diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc
index 8cb915954..0faea45e5 100644
--- a/target/ppc/sys-available/toolchain-ppc
+++ b/target/ppc/sys-available/toolchain-ppc
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
 	bool "Toolchain only"
 	select ADK_ppc
 	select ADK_toolchain_ppc
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a ppc toolchain.
 
diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64
index 1f0061805..3574e863c 100644
--- a/target/ppc64/sys-available/toolchain-ppc64
+++ b/target/ppc64/sys-available/toolchain-ppc64
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	bool "Toolchain only"
 	select ADK_ppc64
 	select ADK_toolchain_ppc64
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a ppc64 toolchain.
 
diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc
index 769cce546..5d1a6c044 100644
--- a/target/sparc/sys-available/toolchain-sparc
+++ b/target/sparc/sys-available/toolchain-sparc
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
 	select ADK_sparc
 	select ADK_toolchain_sparc
 	select ADK_CPU_SPARC_V8
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a sparc toolchain.
 
diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64
index f5c1ff615..060cc62dd 100644
--- a/target/sparc64/sys-available/toolchain-sparc64
+++ b/target/sparc64/sys-available/toolchain-sparc64
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	select ADK_sparc64
 	select ADK_toolchain_sparc64
 	select ADK_CPU_SPARC_V9
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a sparc64 toolchain.
 
diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-x86
index 5c2871f3b..e4c02a0e5 100644
--- a/target/x86/sys-available/toolchain-x86
+++ b/target/x86/sys-available/toolchain-x86
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
 	select ADK_x86
 	select ADK_toolchain_x86
 	select ADK_CPU_I686
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a x86 toolchain (i686 optimized).
 
diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64
index be6a9f5b9..0c175da69 100644
--- a/target/x86_64/sys-available/toolchain-x86_64
+++ b/target/x86_64/sys-available/toolchain-x86_64
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	bool "Toolchain only"
 	select ADK_x86_64
 	select ADK_toolchain_x86_64
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a x86_64 toolchain.