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

19 files changed, 498 insertions, 58364 deletions

diff --git a/TODO b/TODO
index 5b7cb4fe8..e5a2e98e2 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,7 @@
-- update to 2.6.33 
-- microsd filesystem for foxg20
+- fix glibc build for MIPS targets
 - implement update for MTD devices (ag241)
 - fix watchdog for alix1c (mfgpt timers problem)
 - macos x build
-- use LZMA kernels for MIPS targets
 - package drbd
 - new packages for openais and pacemaker
 - continuos build via hudson or sth. like that
diff --git a/package/Config.in b/package/Config.in
index 378ec7c2a..68c81aad1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -6,6 +6,7 @@ menu "Package selection"
 menu "Basesystem"
 source "package/adkinstall/Config.in"
 source "package/base-files/Config.in"
+source "package/base-files/Config.in.manual"
 source "package/busybox/Config.in.manual"
 source "package/cfgfs/Config.in"
 source "package/cryptinit/Config.in"
@@ -64,6 +65,19 @@ source "package/strace/Config.in"
 source "package/valgrind/Config.in"
 endmenu
 
+menu "DNS / DHCP"
+source "package/atftp/Config.in"
+source "package/avahi/Config.in"
+source "package/bind/Config.in"
+source "package/dhcp/Config.in"
+source "package/dhcp-forwarder/Config.in"
+source "package/dnsmasq/Config.in"
+source "package/ez-ipupdate/Config.in"
+source "package/maradns/Config.in"
+source "package/pdnsd/Config.in"
+source "package/updatedd/Config.in"
+endmenu
+
 menu "Filesystem / Blockdevice utilities"
 source "package/aufs2-util/Config.in"
 source "package/dosfstools/Config.in"
@@ -79,133 +93,26 @@ source "package/wdfs/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
 
-menu "Mail"
-source "package/bogofilter/Config.in"
-source "package/dovecot/Config.in"
-source "package/fetchmail/Config.in"
-source "package/mini_sendmail/Config.in"
-source "package/mutt/Config.in"
-source "package/procmail/Config.in"
-source "package/ssmtp/Config.in"
-source "package/vilistextum/Config.in"
-endmenu
-
-menu "Misc"
-source "package/collectd/Config.in"
-source "package/deco/Config.in"
-source "package/dialog/Config.in"
-source "package/digitemp/Config.in"
-source "package/gpm/Config.in"
-source "package/gpsd/Config.in"
-source "package/logrotate/Config.in"
-source "package/mc/Config.in"
-source "package/mgetty/Config.in"
-source "package/monit/Config.in"
-source "package/motion/Config.in"
-source "package/osiris/Config.in"
-source "package/rrdtool/Config.in"
-source "package/rrdcollect/Config.in"
-source "package/sane-backends/Config.in"
-source "package/screen/Config.in"
-source "package/scsi-spin/Config.in"
-source "package/ser2net/Config.in"
-source "package/sqlite/Config.in"
-source "package/syslog-ng/Config.in"
-endmenu
-
-menu "Multimedia"
-source "package/alsa-utils/Config.in"
-source "package/esound/Config.in"
-source "package/ffmpeg/Config.in"
-source "package/gmediaserver/Config.in"
-source "package/icecast/Config.in"
-source "package/lame/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/moc/Config.in"
-source "package/mpd/Config.in"
-source "package/mplayer/Config.in"
-source "package/mt-daapd/Config.in"
-source "package/palantir/Config.in"
-source "package/setpwc/Config.in"
-endmenu
-
-menu "Shells"
-source "package/bash/Config.in"
-source "package/mksh/Config.in"
-source "package/tcsh/Config.in"
-source "package/zsh/Config.in"
-endmenu
-
-
-menu "Serial communications & terminal emulation"
-source "package/heyu/Config.in"
-source "package/lrzsz/Config.in"
-source "package/picocom/Config.in"
-source "package/serdisplib/Config.in"
-source "package/setserial/Config.in"
-endmenu
-
-menu "Telephony"
-source "package/asterisk/Config.in"
-source "package/opensips/Config.in"
-endmenu
-
-menu "Utilities"
-source "package/bc/Config.in"
-source "package/comgt/Config.in"
-source "package/cpufrequtils/Config.in"
-source "package/fbset/Config.in"
-source "package/file/Config.in"
-source "package/findutils/Config.in"
-source "package/hdparm/Config.in"
-source "package/usbutils/Config.in"
-source "package/patch/Config.in"
-source "package/pciutils/Config.in"
-source "package/procps/Config.in"
-source "package/sispmctl/Config.in"
-source "package/stress/Config.in"
-source "package/sysstat/Config.in"
-source "package/swconfig/Config.in"
-source "package/udev/Config.in"
-source "package/watchdog/Config.in"
-endmenu
-
-
-menu "Network - Analyze / Debugging / Monitoring"
-source "package/bwm/Config.in"
-source "package/dsniff/Config.in"
-source "package/ethtool/Config.in"
-source "package/fping/Config.in"
-source "package/fprobe/Config.in"
-source "package/fprobe-ulog/Config.in"
-source "package/httping/Config.in"
-source "package/iftop/Config.in"
-source "package/ipcad/Config.in"
-source "package/iperf/Config.in"
-source "package/iptraf/Config.in"
-source "package/mtr/Config.in"
-source "package/netperf/Config.in"
-source "package/nmap/Config.in"
-source "package/sipsak/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tptest/Config.in"
-source "package/traceroute/Config.in"
-source "package/trafshow/Config.in"
-source "package/ttcp/Config.in"
-endmenu
-
-menu "DNS / DHCP"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
-source "package/bind/Config.in"
-source "package/dhcp/Config.in"
-source "package/dhcp-forwarder/Config.in"
-source "package/dnsmasq/Config.in"
-source "package/ez-ipupdate/Config.in"
-source "package/maradns/Config.in"
-source "package/pdnsd/Config.in"
-source "package/updatedd/Config.in"
+menu "Firewall / Routing / Bridging"
+source "package/arpd/Config.in"
+source "package/bridge-utils/Config.in"
+source "package/linux-atm/Config.in"
+source "package/cutter/Config.in"
+source "package/ebtables/Config.in"
+source "package/ether-wake/Config.in"
+source "package/iproute2/Config.in"
+source "package/ipset/Config.in"
+source "package/iptables/Config.in"
+source "package/knock/Config.in"
+source "package/macchanger/Config.in"
+source "package/netstat-nat/Config.in"
+source "package/quagga/Config.in"
+source "package/ulogd/Config.in"
+source "package/shorewall-common/Config.in"
+source "package/shorewall-shell/Config.in"
+source "package/wol/Config.in"
+source "package/wondershaper/Config.in"
+source "package/vrrpd/Config.in"
 endmenu
 
 menu "HTTP / FTP"
@@ -237,28 +144,6 @@ source "package/reaim/Config.in"
 source "package/tmsnc/Config.in"
 endmenu
 
-menu "Firewall / Routing / Bridging"
-source "package/arpd/Config.in"
-source "package/bridge-utils/Config.in"
-source "package/linux-atm/Config.in"
-source "package/cutter/Config.in"
-source "package/ebtables/Config.in"
-source "package/ether-wake/Config.in"
-source "package/iproute2/Config.in"
-source "package/ipset/Config.in"
-source "package/iptables/Config.in"
-source "package/knock/Config.in"
-source "package/macchanger/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/quagga/Config.in"
-source "package/ulogd/Config.in"
-source "package/shorewall-common/Config.in"
-source "package/shorewall-shell/Config.in"
-source "package/wol/Config.in"
-source "package/wondershaper/Config.in"
-source "package/vrrpd/Config.in"
-endmenu
-
 menu "Libraries"
 source "package/alsa-lib/Config.in"
 source "package/apr/Config.in"
@@ -441,6 +326,79 @@ source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
+menu "Mail"
+source "package/bogofilter/Config.in"
+source "package/dovecot/Config.in"
+source "package/fetchmail/Config.in"
+source "package/mini_sendmail/Config.in"
+source "package/mutt/Config.in"
+source "package/procmail/Config.in"
+source "package/ssmtp/Config.in"
+source "package/vilistextum/Config.in"
+endmenu
+
+menu "Misc"
+source "package/collectd/Config.in"
+source "package/deco/Config.in"
+source "package/dialog/Config.in"
+source "package/digitemp/Config.in"
+source "package/gpm/Config.in"
+source "package/gpsd/Config.in"
+source "package/logrotate/Config.in"
+source "package/mc/Config.in"
+source "package/mgetty/Config.in"
+source "package/monit/Config.in"
+source "package/motion/Config.in"
+source "package/osiris/Config.in"
+source "package/rrdtool/Config.in"
+source "package/rrdcollect/Config.in"
+source "package/sane-backends/Config.in"
+source "package/screen/Config.in"
+source "package/scsi-spin/Config.in"
+source "package/ser2net/Config.in"
+source "package/sqlite/Config.in"
+source "package/syslog-ng/Config.in"
+endmenu
+
+menu "Multimedia"
+source "package/alsa-utils/Config.in"
+source "package/esound/Config.in"
+source "package/ffmpeg/Config.in"
+source "package/gmediaserver/Config.in"
+source "package/icecast/Config.in"
+source "package/lame/Config.in"
+source "package/madplay/Config.in"
+source "package/mpg123/Config.in"
+source "package/moc/Config.in"
+source "package/mpd/Config.in"
+source "package/mplayer/Config.in"
+source "package/mt-daapd/Config.in"
+source "package/palantir/Config.in"
+source "package/setpwc/Config.in"
+endmenu
+
+menu "Network - Analyze / Debugging / Monitoring"
+source "package/bwm/Config.in"
+source "package/dsniff/Config.in"
+source "package/ethtool/Config.in"
+source "package/fping/Config.in"
+source "package/fprobe/Config.in"
+source "package/fprobe-ulog/Config.in"
+source "package/httping/Config.in"
+source "package/iftop/Config.in"
+source "package/ipcad/Config.in"
+source "package/iperf/Config.in"
+source "package/iptraf/Config.in"
+source "package/mtr/Config.in"
+source "package/netperf/Config.in"
+source "package/nmap/Config.in"
+source "package/sipsak/Config.in"
+source "package/tcpdump/Config.in"
+source "package/tptest/Config.in"
+source "package/traceroute/Config.in"
+source "package/trafshow/Config.in"
+source "package/ttcp/Config.in"
+endmenu
 
 menu "Networking Misc"
 source "package/cups/Config.in"
@@ -476,6 +434,28 @@ source "package/nfs-utils/Config.in"
 source "package/samba/Config.in"
 endmenu
 
+menu "Network Security"
+source "package/arpwatch/Config.in"
+source "package/autossh/Config.in"
+source "package/axtls/Config.in"
+source "package/ca-certificates/Config.in"
+source "package/dropbear/Config.in"
+source "package/httptunnel/Config.in"
+source "package/ipsec-tools/Config.in"
+source "package/l2tpns/Config.in"
+source "package/openssh/Config.in"
+source "package/openssh/Config.in.kerberos"
+source "package/openswan/Config.in"
+source "package/openvpn/Config.in"
+source "package/portsentry/Config.in"
+source "package/ptunnel/Config.in"
+source "package/scanlogd/Config.in"
+source "package/snort/Config.in"
+source "package/ssltunnel/Config.in"
+source "package/tinc/Config.in"
+source "package/vpnc/Config.in"
+endmenu
+
 menu "NTP"
 source "package/htpdate/Config.in"
 source "package/ntpclient/Config.in"
@@ -537,28 +517,6 @@ source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 endmenu
 
-menu "Networking Security"
-source "package/arpwatch/Config.in"
-source "package/autossh/Config.in"
-source "package/axtls/Config.in"
-source "package/ca-certificates/Config.in"
-source "package/dropbear/Config.in"
-source "package/httptunnel/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/l2tpns/Config.in"
-source "package/openssh/Config.in"
-source "package/openssh/Config.in.kerberos"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/portsentry/Config.in"
-source "package/ptunnel/Config.in"
-source "package/scanlogd/Config.in"
-source "package/snort/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/tinc/Config.in"
-source "package/vpnc/Config.in"
-endmenu
-
 menu "SCM"
 #source "package/bzr/Config.in"
 source "package/cvs/Config.in"
@@ -566,6 +524,46 @@ source "package/git/Config.in"
 source "package/subversion/Config.in"
 endmenu
 
+menu "Shells"
+source "package/bash/Config.in"
+source "package/mksh/Config.in"
+source "package/tcsh/Config.in"
+source "package/zsh/Config.in"
+endmenu
+
+menu "Serial communications & terminal emulation"
+source "package/heyu/Config.in"
+source "package/lrzsz/Config.in"
+source "package/picocom/Config.in"
+source "package/serdisplib/Config.in"
+source "package/setserial/Config.in"
+endmenu
+
+menu "Telephony"
+source "package/asterisk/Config.in"
+source "package/opensips/Config.in"
+endmenu
+
+menu "Utilities"
+source "package/bc/Config.in"
+source "package/comgt/Config.in"
+source "package/cpufrequtils/Config.in"
+source "package/fbset/Config.in"
+source "package/file/Config.in"
+source "package/findutils/Config.in"
+source "package/hdparm/Config.in"
+source "package/usbutils/Config.in"
+source "package/patch/Config.in"
+source "package/pciutils/Config.in"
+source "package/procps/Config.in"
+source "package/sispmctl/Config.in"
+source "package/stress/Config.in"
+source "package/sysstat/Config.in"
+source "package/swconfig/Config.in"
+source "package/udev/Config.in"
+source "package/watchdog/Config.in"
+endmenu
+
 menu "Wireless"
 source "package/aircrack-ng/Config.in"
 source "package/chillispot/Config.in"
@@ -579,8 +577,7 @@ source "package/wifidog/Config.in"
 source "package/wpa_supplicant/Config.in"
 endmenu
 
-
-menu "Xorg server and drivers"
+menu "X server and drivers"
 source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
@@ -589,7 +586,7 @@ source "package/xf86-input-keyboard/Config.in"
 source "package/xf86-input-evtouch/Config.in"
 endmenu
 
-menu "X Applications"
+menu "X applications"
 source "package/evilwm/Config.in"
 source "package/font-util/Config.in"
 source "package/rxvt-unicode/Config.in"
@@ -597,7 +594,7 @@ source "package/xauth/Config.in"
 source "package/xlsfonts/Config.in"
 endmenu
 
-menu "X Fonts"
+menu "X fonts"
 source "package/font-adobe-75dpi/Config.in"
 source "package/font-adobe-100dpi/Config.in"
 source "package/font-bitstream-75dpi/Config.in"
@@ -613,7 +610,7 @@ source "package/font-misc-misc/Config.in"
 source "package/font-xfree86-type1/Config.in"
 endmenu
 
-menu "X Libraries"
+menu "X libraries"
 source "package/libICE/Config.in"
 source "package/libICE/Config.in.lib"
 source "package/libSM/Config.in"
@@ -651,7 +648,6 @@ source "package/libXft/Config.in.lib"
 source "package/libXxf86dga/Config.in"
 source "package/libXxf86dga/Config.in.lib"
 source "package/pixman/Config.in"
-#source "package/xf86dga/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu
@@ -660,4 +656,3 @@ endmenu
 menu "Kernel configuration"
 source "target/linux/Config.in"
 endmenu
-
diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual
new file mode 100644
index 000000000..d750ff3ef
--- /dev/null
+++ b/package/base-files/Config.in.manual
@@ -0,0 +1,10 @@
+config ADK_PACKAGE_CONFIG_IN_ETC
+	prompt ".config in /etc.................. include buildsystem configuration in image"
+	bool
+	depends on ADK_PACKAGE_BASE_FILES
+	default y if !ADK_TOOLCHAIN_ONLY
+	help
+         Copy the configuration file (.config) to the image.  The
+         file will be found in /etc/adkconfig.gz. This takes about
+         7kBytes of file system space. From this file you can always rebuild
+         the image from source.
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 0366fa2ef..c9298e15d 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -15,6 +15,8 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -35,5 +37,6 @@ do-build:
 do-install:
 	$(CP) ./files/initramfs_list $(LINUX_DIR)
 	$(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR)
+	@touch ${IDIR_CRYPTINIT}/.empty
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 932871dcf..5c3c76899 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -73,13 +73,13 @@ eglibc-dev-install:
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
 		${EGLIBC_ENV} \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
 			--prefix=$(IDIR_EGLIBC_DEV)/usr \
 			--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
 			${EGLIBC_CONFOPTS} \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index ddda531a9..084a71918 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -57,12 +57,12 @@ glibc-dev-install:
 	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
-		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \
+		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
 		--prefix=/usr \
 		--with-sysroot=$(IDIR_GLIBC_DEV) \
 		${GLIBC_CONFOPTS} \
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index aeffb3563..787dc4e56 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -41,10 +41,10 @@ uclibc-dev-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \
diff --git a/scripts/automake.dep b/scripts/automake.dep
index 901d12912..13e4e87a9 100644
--- a/scripts/automake.dep
+++ b/scripts/automake.dep
@@ -1,5 +1,6 @@
 configure configure.ac
 configure configure.in
+configure configure.sh
 configure missing
 /Makefile.in /Makefile.am
 /Makefile.in configure.in
diff --git a/scripts/install.sh b/scripts/install.sh
index a6b1ce331..bfd2ababc 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -132,6 +132,15 @@ if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then
 	fi
 fi
 
+case $2 in
+	wrap*)
+		speed=38400
+		;;
+	*)
+		speed=115200
+		;;
+esac
+
 if [ $rb532 -ne 0 ];then
 	printf "Create partition and filesystem for rb532\n"
 	rootpart=${1}2
@@ -209,14 +218,14 @@ if [ $rb532 -eq 0 ];then
 cat << EOF > $tmp/boot/grub/grub.cfg
 set default=0
 set timeout=1
-serial --unit=0 --speed=115200
+serial --unit=0 --speed=$speed
 terminal_output serial 
 terminal_input serial 
 
 menuentry "GNU/Linux (OpenADK)" {
 	insmod ext2
 	set root=(hd0,1)
-	linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,115200 console=tty0 panic=10
+	linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,$speed console=tty0 panic=10
 }
 EOF
 	chroot $tmp grub-install $1
diff --git a/target/Config.in b/target/Config.in
index 2fae1fecb..58cd64178 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -762,8 +762,6 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
-		ADK_LINUX_ARM_TOMTOM || \
-		ADK_LINUX_ARM_G1 || \
 		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_TOOLCHAIN 
 	help
@@ -773,24 +771,13 @@ config ADK_TARGET_LIB_GLIBC
 	bool "GNU C library"
 	select ADK_glibc
 	depends on ADK_LINUX_X86_QEMU || \
-		ADK_LINUX_ARM_QEMU || \
-		ADK_LINUX_MIPS_QEMU || \
-		ADK_LINUX_MIPS64_QEMU || \
-		ADK_LINUX_MIPSEL_QEMU || \
-		ADK_LINUX_MIPS64EL_QEMU || \
 		ADK_LINUX_X86_64_QEMU || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
 		ADK_LINUX_X86_WRAP || \
-		ADK_LINUX_MIPS_RB411 || \
-		ADK_LINUX_MIPS_RB433 || \
-		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
-		ADK_LINUX_ARM_TOMTOM || \
-		ADK_LINUX_ARM_G1 || \
-		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_TOOLCHAIN 
 	help
 	 http://www.gnu.org/libc
@@ -813,7 +800,9 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	bool "initramfs filesystem"
 	depends on \
 		ADK_LINUX_QEMU || \
+		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_NATIVE || \
+		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_RESCUE
 	select ADK_KERNEL_BLK_DEV_INITRD
 	help
@@ -826,6 +815,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_NATIVE || \
+		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_RESCUE
 	help
 	  create an read-only initramfs system.
@@ -976,7 +966,6 @@ endchoice
 
 choice
 prompt "Compression method for Kernel"
-	depends on ADK_LINUX_QEMU || ADK_LINUX_ALIX
 	depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK)
 	
 config ADK_TARGET_KERNEL_COMPRESSION_GZIP
diff --git a/target/foxg20/patches/foxg20.patch b/target/foxg20/patches/foxg20.patch
index bda411c98..1f628574e 100644
--- a/target/foxg20/patches/foxg20.patch
+++ b/target/foxg20/patches/foxg20.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/arm/include/asm/setup.h
---- linux-2.6.32.2.orig/arch/arm/include/asm/setup.h	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/include/asm/setup.h	2010-02-23 21:40:33.000000000 +0100
+diff -Nur linux-2.6.33.orig/arch/arm/include/asm/setup.h linux-2.6.33/arch/arm/include/asm/setup.h
+--- linux-2.6.33.orig/arch/arm/include/asm/setup.h	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/include/asm/setup.h	2010-02-27 19:32:30.150085477 +0100
 @@ -18,6 +18,8 @@
  
  #define COMMAND_LINE_SIZE 1024
@@ -10,23 +10,22 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/a
  /* The list ends with an ATAG_NONE node. */
  #define ATAG_NONE	0x00000000
  
-diff -Nur linux-2.6.32.2.orig/arch/arm/Kconfig linux-2.6.32.2/arch/arm/Kconfig
---- linux-2.6.32.2.orig/arch/arm/Kconfig	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/Kconfig	2010-02-23 21:18:53.000000000 +0100
-@@ -18,6 +18,9 @@
- 	select HAVE_KRETPROBES if (HAVE_KPROBES)
+diff -Nur linux-2.6.33.orig/arch/arm/Kconfig linux-2.6.33/arch/arm/Kconfig
+--- linux-2.6.33.orig/arch/arm/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/Kconfig	2010-02-27 20:23:52.139866005 +0100
+@@ -19,6 +19,8 @@
  	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
  	select HAVE_GENERIC_DMA_COHERENT
-+	select HAVE_KERNEL_GZIP
+ 	select HAVE_KERNEL_GZIP
 +	select HAVE_KERNEL_BZIP2
 +	select HAVE_KERNEL_LZMA
+ 	select HAVE_KERNEL_LZO
  	help
  	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
-diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/kernel/setup.c
---- linux-2.6.32.2.orig/arch/arm/kernel/setup.c	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/kernel/setup.c	2010-02-23 21:29:01.000000000 +0100
-@@ -806,8 +806,12 @@
+diff -Nur linux-2.6.33.orig/arch/arm/kernel/setup.c linux-2.6.33/arch/arm/kernel/setup.c
+--- linux-2.6.33.orig/arch/arm/kernel/setup.c	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/kernel/setup.c	2010-02-27 19:32:30.212085837 +0100
+@@ -807,8 +807,12 @@
  
  static int c_show(struct seq_file *m, void *v)
  {
@@ -39,9 +38,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/ke
  	seq_printf(m, "Processor\t: %s rev %d (%s)\n",
  		   cpu_name, read_cpuid_id() & 15, elf_platform);
  
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c
---- linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c	2010-02-23 21:18:53.000000000 +0100
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c
+--- linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c	2010-02-27 19:32:30.233294964 +0100
 @@ -454,7 +454,15 @@
  	.sda_is_open_drain	= 1,
  	.scl_pin		= AT91_PIN_PA24,
@@ -58,9 +57,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6
  };
  
  static struct platform_device at91sam9260_twi_device = {
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c
---- linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c	2010-02-23 21:33:34.000000000 +0100
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.33/arch/arm/mach-at91/board-foxg20.c
+--- linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.33/arch/arm/mach-at91/board-foxg20.c	2010-02-27 19:32:30.235748629 +0100
 @@ -0,0 +1,376 @@
 +/*
 + *  Copyright (C) 2005 SAN People
@@ -438,15 +437,17 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/a
 +	.init_irq	= foxg20_init_irq,
 +	.init_machine	= foxg20_board_init,
 +MACHINE_END
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm/mach-at91/Kconfig
---- linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/mach-at91/Kconfig	2010-02-23 21:18:53.000000000 +0100
-@@ -333,6 +333,13 @@
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Kconfig linux-2.6.33/arch/arm/mach-at91/Kconfig
+--- linux-2.6.33.orig/arch/arm/mach-at91/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/mach-at91/Kconfig	2010-02-27 20:22:57.467867560 +0100
+@@ -354,6 +354,15 @@
  	  Select this if you are using a Eukrea Electromatique's
  	  CPU9G20 Board <http://www.eukrea.com/>
  
 +config MACH_FOXG20
 +	bool "Acme Systems FOX G20"
++	select HAVE_AT91_DATAFLASH_CARD
++	select HAVE_NAND_ATMEL_BUSWIDTH_16
 +	depends on ARCH_AT91SAM9G20
 +	help
 +	  Select this if you are using Acme Systems
@@ -455,26 +456,10 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm
  endif
  
  # ----------------------------------------------------------
-@@ -388,13 +395,13 @@
- 
- config MTD_AT91_DATAFLASH_CARD
- 	bool "Enable DataFlash Card support"
--	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926)
-+	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926 || MACH_FOXG20)
- 	help
- 	  Enable support for the DataFlash card.
- 
- config MTD_NAND_ATMEL_BUSWIDTH_16
- 	bool "Enable 16-bit data bus interface to NAND flash"
--	depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK)
-+	depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK || MACH_FOXG20)
- 	help
- 	  On AT91SAM926x boards both types of NAND flash can be present
- 	  (8 and 16 bit data bus width).
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/arm/mach-at91/Makefile
---- linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/arch/arm/mach-at91/Makefile	2010-02-23 21:18:53.000000000 +0100
-@@ -65,6 +65,9 @@
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Makefile linux-2.6.33/arch/arm/mach-at91/Makefile
+--- linux-2.6.33.orig/arch/arm/mach-at91/Makefile	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/arm/mach-at91/Makefile	2010-02-27 19:32:30.295749847 +0100
+@@ -66,6 +66,9 @@
  # AT91SAM9G45 board-specific support
  obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o
  
@@ -484,9 +469,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/ar
  # AT91CAP9 board-specific support
  obj-$(CONFIG_MACH_AT91CAP9ADK)	+= board-cap9adk.o
  
-diff -Nur linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c linux-2.6.32.2/drivers/mmc/host/at91_mci.c
---- linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c	2009-12-18 23:27:07.000000000 +0100
-+++ linux-2.6.32.2/drivers/mmc/host/at91_mci.c	2010-02-23 21:18:53.000000000 +0100
+diff -Nur linux-2.6.33.orig/drivers/mmc/host/at91_mci.c linux-2.6.33/drivers/mmc/host/at91_mci.c
+--- linux-2.6.33.orig/drivers/mmc/host/at91_mci.c	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/drivers/mmc/host/at91_mci.c	2010-02-27 19:32:30.295749847 +0100
 @@ -461,7 +461,7 @@
  	at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);
  	mr = AT91_MCI_PDCMODE | 0x34a;
diff --git a/target/foxg20/target.mk b/target/foxg20/target.mk
index 5a7e677d7..0a6a7cb34 100644
--- a/target/foxg20/target.mk
+++ b/target/foxg20/target.mk
@@ -1,8 +1,8 @@
 # arm default is little endian, this target uses EABI
 ARCH:=			arm
 CPU_ARCH:=		arm
-KERNEL_VERSION:=	2.6.32.2
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    -march=armv5te -mtune=arm926ej-s
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index 951d0b3cc..e93f13b4a 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -7,33 +7,41 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
-OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-
 kernel-install:
-	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
-		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+	@cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 
 createinit:
+	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE)
+	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \
+		$(LINUX_DIR)/.config
+	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)