merge of '363edf7af76f2d2fcd09d314641bad256b866264'

     and 'e0812b867aee310381150ec8e2be57aab30190a6'

85 files changed, 4779 insertions, 864 deletions

diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index d0f59d2cd4..cf3419f824 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -5,8 +5,7 @@ inherit qmake_base
 
 DEPENDS_prepend = "qmake2-native uicmoc4-native "
 
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
-export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
@@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass
index 86bc7afc2f..181973d72d 100644
--- a/classes/qtopia4core.bbclass
+++ b/classes/qtopia4core.bbclass
@@ -4,8 +4,8 @@ inherit qmake2
 #
 # override variables set by qmake-base to compile QtopiaCore apps
 #
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = ""
-EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "
+export OE_QMAKE_EXTRA_MODULES = "network"
diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass
index fd09946061..f657e5be94 100644
--- a/classes/xilinx-bsp.bbclass
+++ b/classes/xilinx-bsp.bbclass
@@ -34,7 +34,7 @@ fi
 case "${XILINX_BOARD}" in
      ML403)
         oenote "ML403 board setup"
-        cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
+        cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
                 ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
      ;;
 
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 76eacce219..eadb6a09a9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9446,13 +9446,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
 md5=8012acea71b35c18247bd92c4721589d
 sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
 
+[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.3.tar.gz]
+md5=19678fe35170559cd6a6fa531c57799c
+sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
+
 [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
 
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
-md5=70b729dd5dd8b2b432d685918e1971f1
-sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
+md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
+sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
 
 [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz]
 md5=0e2bab65b62784d8714057624373f70d
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f36ae8c6fe..80f1512acf 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,7 +7,7 @@
 #@--------------------------------------------------------------------
 
 # The release will the 2007.12
-DISTRO_VERSION = "2007.11RC2.1"
+DISTRO_VERSION = "2007.11RC3"
 DISTRO_REVISION = "51"
 
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index ffb5380a14..97fed90f21 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1616,7 +1616,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6"
 PREFERRED_VERSION_qsvn ?= "0.3.0"
 PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
 PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.3"
 PREFERRED_VERSION_qtplot ?= "0.2"
 PREFERRED_VERSION_quagga ?= "0.99.8"
 PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1893,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8"
 PREFERRED_VERSION_ufraw ?= "0.12"
 PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
 PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.3"
 PREFERRED_VERSION_uim ?= "1.3.1"
 PREFERRED_VERSION_uim-native ?= "1.3.1"
 PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index a8a2d60c17..6eeb08825b 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_VERSION_u-boot = "1.1.4"
+KERNEL_IMAGETYPE = "uImage"
 
 #tune for the 405 cpu
 require conf/machine/include/tune-ppc405.inc
diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index 23bdfaf64b..07040562dd 100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
@@ -3,10 +3,10 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \
-	    ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \
+	    ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \
 	   file://atftpd.init"
 S = "${WORKDIR}/atftp-${PV}"
 
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index ca2db7e760..262d6afff1 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -94,7 +94,7 @@ pkg_prerm_${PN} () {
 	# providing its files, this will make update-alternatives work, but the update-rc.d part
 	# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
 	tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
-	cp -a /bin/busybox $tmpdir/
+	cp -pPR /bin/busybox $tmpdir/
 	ln -s /bin/busybox $tmpdir/[
 	ln -s /bin/busybox $tmpdir/test
 	ln -s /bin/busybox $tmpdir/head
diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb
index 9aba2a2f0a..5756e98567 100644
--- a/packages/gallery/gallery_1.5.5.bb
+++ b/packages/gallery/gallery_1.5.5.bb
@@ -32,7 +32,7 @@ do_compile() {
 #
 do_install() {
 	mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d
-	cp -a ${S} ${D}/${DEST_DIR}
+	cp -pPR ${S} ${D}/${DEST_DIR}
 	cp ${FILESDIR}/gallery.conf  ${D}/etc/apache2/modules.d/95_gallery.conf
 }
 
diff --git a/packages/git/git.inc b/packages/git/git.inc
index 7115d44b35..3a80c5d950 100644
--- a/packages/git/git.inc
+++ b/packages/git/git.inc
@@ -3,7 +3,9 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1"
+           file://autotools.patch;patch=1 \
+           file://git-gui-install-mode-arg-spaces.patch;patch=1 \
+	   "
 S = "${WORKDIR}/git-${PV}"
 
 EXTRA_OEMAKE = "NO_TCLTL=1"
diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass
index a859ac2ca9..702d354591 100644
--- a/packages/glibc/eglibc-package.bbclass
+++ b/packages/glibc/eglibc-package.bbclass
@@ -150,14 +150,14 @@ do_prep_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 	rm -rf $treedir
 	mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-	cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+	cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
 	# unzip to avoid parsing errors
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+	ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
 	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
-		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+		cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
 	fi
 	install -m 0755 ${D}${bindir}/localedef $treedir/bin
 }
@@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 
 	mkdir -p ${D}${libdir}
-	cp -a $treedir/${libdir}/locale ${D}${libdir}
+	cp -pPR $treedir/${libdir}/locale ${D}${libdir}
 }
 
 python package_do_split_gconvs () {
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index b96aae37b9..50fae44bf3 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -141,17 +141,17 @@ do_prep_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 	rm -rf $treedir
 	mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-	cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+	cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
 	# unzip to avoid parsing errors
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+	ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
 	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
-		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+		cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
 	fi
 	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
-		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+		cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
 	fi
 	install -m 0755 ${D}${bindir}/localedef $treedir/bin
 }
@@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 
 	mkdir -p ${D}${libdir}
-	cp -a $treedir/${libdir}/locale ${D}${libdir}
+	cp -pPR $treedir/${libdir}/locale ${D}${libdir}
 }
 
 python package_do_split_gconvs () {
diff --git a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty
+++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty
diff --git a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig
index b6b752f623..b6b752f623 100644
--- a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig
+++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig
diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/linux/linux-dht-walnut/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty
+++ b/packages/linux/linux-dht-walnut/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty
+++ b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty
diff --git a/packages/linux/linux-dht-walnut/dht-walnut/defconfig b/packages/linux/linux-dht-walnut/dht-walnut/defconfig
new file mode 100644
index 0000000000..ddd6d9fc8f
--- /dev/null
+++ b/packages/linux/linux-dht-walnut/dht-walnut/defconfig
@@ -0,0 +1,2353 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23
+# Wed Dec 26 13:45:00 2007
+#
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_LSF=y
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Processor
+#
+# CONFIG_6xx is not set
+CONFIG_40x=y
+# CONFIG_44x is not set
+# CONFIG_8xx is not set
+# CONFIG_E200 is not set
+# CONFIG_E500 is not set
+CONFIG_PPC_DCR_NATIVE=y
+CONFIG_PPC_DCR=y
+CONFIG_MATH_EMULATION=y
+# CONFIG_KEXEC is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_4xx=y
+# CONFIG_WANT_EARLY_SERIAL is not set
+
+#
+# IBM 4xx options
+#
+# CONFIG_BUBINGA is not set
+# CONFIG_CPCI405 is not set
+# CONFIG_EP405 is not set
+# CONFIG_REDWOOD_5 is not set
+# CONFIG_REDWOOD_6 is not set
+# CONFIG_SYCAMORE is not set
+CONFIG_WALNUT=y
+# CONFIG_XILINX_ML300 is not set
+# CONFIG_XILINX_ML403 is not set
+CONFIG_IBM405_ERR77=y
+CONFIG_IBM405_ERR51=y
+CONFIG_IBM_OCP=y
+CONFIG_BIOS_FIXUP=y
+CONFIG_405GP=y
+CONFIG_PPC4xx_DMA=y
+CONFIG_PPC4xx_EDMA=y
+CONFIG_PPC_GEN550=y
+CONFIG_UART0_TTYS0=y
+# CONFIG_UART0_TTYS1 is not set
+CONFIG_NOT_COHERENT_CACHE=y
+
+#
+# Platform options
+#
+# CONFIG_PC_KEYBOARD is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_BKL is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=" debug "
+# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+# CONFIG_PPC_I8259 is not set
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=m
+
+#
+# Advanced setup
+#
+CONFIG_ADVANCED_OPTIONS=y
+CONFIG_HIGHMEM_START=0xfe000000
+# CONFIG_LOWMEM_SIZE_BOOL is not set
+CONFIG_LOWMEM_SIZE=0x30000000
+# CONFIG_KERNEL_START_BOOL is not set
+CONFIG_KERNEL_START=0xc0000000
+# CONFIG_TASK_SIZE_BOOL is not set
+CONFIG_TASK_SIZE=0x80000000
+# CONFIG_CONSISTENT_START_BOOL is not set
+CONFIG_CONSISTENT_START=0xff100000
+# CONFIG_CONSISTENT_SIZE_BOOL is not set
+CONFIG_CONSISTENT_SIZE=0x00200000
+# CONFIG_BOOT_LOAD_BOOL is not set
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_IP6_NF_QUEUE=m
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+# CONFIG_DEV_APPLETALK is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_ECONET=m
+# CONFIG_ECONET_AUNUDP is not set
+# CONFIG_ECONET_NATIVE is not set
+CONFIG_WAN_ROUTER=m
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_RR is not set
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_CLS_POLICE=y
+# CONFIG_NET_CLS_IND is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+# CONFIG_NFTL_RW is not set
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0x4000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_WALNUT=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_SLRAM=y
+CONFIG_MTD_PHRAM=y
+# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_BLOCK2MTD=y
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+# CONFIG_MTD_DOCPROBE_ADVANCED is not set
+CONFIG_MTD_DOCPROBE_ADDRESS=0
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_ONENAND=m
+# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND_OTP is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_PC_PCMCIA is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_UB=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_DELKIN is not set
+CONFIG_BLK_DEV_IDECD=y
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+CONFIG_BLK_DEV_OFFBOARD=y
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+CONFIG_BLK_DEV_PDC202XX_OLD=y
+CONFIG_PDC202XX_BURST=y
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_ATA is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_RAID5_RESHAPE=y
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_DM_MULTIPATH_RDAC=m
+CONFIG_DM_DELAY=m
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+
+#
+# Controllers
+#
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocols
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_IFB is not set
+# CONFIG_DUMMY is not set
+CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+# CONFIG_ULI526X is not set
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_PCMCIA_XIRTULIP=m
+CONFIG_HP100=m
+CONFIG_IBM_EMAC=y
+CONFIG_IBM_EMAC_RXB=128
+CONFIG_IBM_EMAC_TXB=64
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
+# CONFIG_IBM_EMAC_DEBUG is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_PCNET32_NAPI is not set
+CONFIG_AMD8111_ETH=m
+# CONFIG_AMD8111E_NAPI is not set
+CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
+CONFIG_B44=m
+CONFIG_FORCEDETH=m
+# CONFIG_FORCEDETH_NAPI is not set
+CONFIG_DGRS=m
+CONFIG_EEPRO100=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+# CONFIG_NET_POCKET is not set
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
+# CONFIG_R8169_VLAN is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+CONFIG_SK98LIN=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+CONFIG_USB_PEGASUS=y
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET_MII=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_CDCETHER=y
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=y
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=y
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_X25 is not set
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300=m
+
+#
+# Cyclades-PC300 MLPPP support is disabled.
+#
+
+#
+# Refer to the file README.mlppp, provided by PC300 package.
+#
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+# CONFIG_WAN_ROUTER_DRIVERS is not set
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E_MAYBE is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+# CONFIG_PPPOL2TP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+# CONFIG_NET_FC is not set
+CONFIG_SHAPER=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+# CONFIG_TIPAR is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_BOOKE_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+# CONFIG_WDT_501_PCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_HW_RANDOM=m
+CONFIG_NVRAM=m
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCF=y
+CONFIG_I2C_ALGOPCA=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_IBM_IIC=y
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+CONFIG_SENSORS_DS1337=m
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+# CONFIG_SENSORS_PCA9539 is not set
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_M41T00=m
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_LM70_LLP is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_W1=m
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=m
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_BT848=m
+# CONFIG_VIDEO_BT848_DVB is not set
+# CONFIG_VIDEO_SAA6588 is not set
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_USB=m
+# CONFIG_VIDEO_CPIA2 is not set
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+# CONFIG_TUNER_TEA5761 is not set
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+# CONFIG_VIDEO_ZORAN_AVS6EYES is not set
+CONFIG_VIDEO_SAA7134=m
+# CONFIG_VIDEO_SAA7134_ALSA is not set
+# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+# CONFIG_VIDEO_CX88_ALSA is not set
+# CONFIG_VIDEO_CX88_BLACKBIRD is not set
+# CONFIG_VIDEO_CX88_DVB is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_USBVISION is not set
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+# CONFIG_USB_ZC0301 is not set
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_USB_DSBR=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+# CONFIG_DVB_AV7110_FIRMWARE is not set
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_CINERGYT2=m
+# CONFIG_DVB_CINERGYT2_TUNING is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_CX24110=m
+# CONFIG_DVB_CX24123 is not set
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_TDA10086=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+
+#
+# Tuners/PLL support
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TDA826X=m
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
+
+#
+# Miscellaneous devices
+#
+CONFIG_DVB_LNBP21=m
+# CONFIG_DVB_ISL6421 is not set
+CONFIG_DVB_TUA6100=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+CONFIG_FB_MATROX=y
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_MATROX_MULTIHEAD=y
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_BT87X_OVERCLOCK=y
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_AC97_POWER_SAVE=y
+
+#
+# ALSA PowerMac devices
+#
+
+#
+# ALSA PowerPC devices
+#
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+# CONFIG_USB_U132_HCD is not set
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_CS is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+CONFIG_USB_SERIAL_AIRPRIME=m
+# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_EZUSB=y
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_AUERSWALD=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+# CONFIG_USB_BERRY_CHARGE is not set
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=m
+
+#
+# USB DSL modem support
+#
+CONFIG_USB_ATM=m
+# CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_XUSBATM is not set
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+
+#
+# DMA Engine support
+#
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_IOATDMA=m
+# CONFIG_AUXDISPLAY is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=m
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_SPKM3=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# IBM 40x options
+#
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SERIAL_TEXT_DEBUG is not set
+CONFIG_PPC_OCP=y
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_ROOTPLUG=m
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_LRW=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_HW=y
diff --git a/packages/linux/linux-dht-walnut/remove-todc.patch b/packages/linux/linux-dht-walnut/remove-todc.patch
new file mode 100644
index 0000000000..afdc904a08
--- /dev/null
+++ b/packages/linux/linux-dht-walnut/remove-todc.patch
@@ -0,0 +1,920 @@
+Index: working-2.6/arch/powerpc/sysdev/todc.c
+===================================================================
+--- working-2.6.orig/arch/powerpc/sysdev/todc.c	2006-08-25 14:27:11.000000000 +1000
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,392 +0,0 @@ 
+-/*
+- * Time of Day Clock support for the M48T35, M48T37, M48T59, and MC146818
+- * Real Time Clocks/Timekeepers.
+- *
+- * Author: Mark A. Greer <mgreer@mvista.com>
+- *
+- * 2001-2004 (c) MontaVista, Software, Inc.  This file is licensed under
+- * the terms of the GNU General Public License version 2.  This program
+- * is licensed "as is" without any warranty of any kind, whether express
+- * or implied.
+- */
+-#include <linux/errno.h>
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/time.h>
+-#include <linux/timex.h>
+-#include <linux/bcd.h>
+-#include <linux/mc146818rtc.h>
+-
+-#include <asm/machdep.h>
+-#include <asm/io.h>
+-#include <asm/time.h>
+-#include <asm/todc.h>
+-
+-/*
+- * Depending on the hardware on your board and your board design, the
+- * RTC/NVRAM may be accessed either directly (like normal memory) or via
+- * address/data registers.  If your board uses the direct method, set
+- * 'nvram_data' to the base address of your nvram and leave 'nvram_as0' and
+- * 'nvram_as1' NULL.  If your board uses address/data regs to access nvram,
+- * set 'nvram_as0' to the address of the lower byte, set 'nvram_as1' to the
+- * address of the upper byte (leave NULL if using mc146818), and set
+- * 'nvram_data' to the address of the 8-bit data register.
+- *
+- * Note: Even though the documentation for the various RTC chips say that it
+- * 	 take up to a second before it starts updating once the 'R' bit is
+- * 	 cleared, they always seem to update even though we bang on it many
+- * 	 times a second.  This is true, except for the Dallas Semi 1746/1747
+- * 	 (possibly others).  Those chips seem to have a real problem whenever
+- * 	 we set the 'R' bit before reading them, they basically stop counting.
+- * 	 					--MAG
+- */
+-
+-/*
+- * 'todc_info' should be initialized in your *_setup.c file to
+- * point to a fully initialized 'todc_info_t' structure.
+- * This structure holds all the register offsets for your particular
+- * TODC/RTC chip.
+- * TODC_ALLOC()/TODC_INIT() will allocate and initialize this table for you.
+- */
+-
+-#ifdef	RTC_FREQ_SELECT
+-#undef	RTC_FREQ_SELECT
+-#define	RTC_FREQ_SELECT		control_b	/* Register A */
+-#endif
+-
+-#ifdef	RTC_CONTROL
+-#undef	RTC_CONTROL
+-#define	RTC_CONTROL		control_a	/* Register B */
+-#endif
+-
+-#ifdef	RTC_INTR_FLAGS
+-#undef	RTC_INTR_FLAGS
+-#define	RTC_INTR_FLAGS		watchdog	/* Register C */
+-#endif
+-
+-#ifdef	RTC_VALID
+-#undef	RTC_VALID
+-#define	RTC_VALID		interrupts	/* Register D */
+-#endif
+-
+-/* Access routines when RTC accessed directly (like normal memory) */
+-u_char
+-todc_direct_read_val(int addr)
+-{
+-	return readb((void __iomem *)(todc_info->nvram_data + addr));
+-}
+-
+-void
+-todc_direct_write_val(int addr, unsigned char val)
+-{
+-	writeb(val, (void __iomem *)(todc_info->nvram_data + addr));
+-	return;
+-}
+-
+-/* Access routines for accessing m48txx type chips via addr/data regs */
+-u_char
+-todc_m48txx_read_val(int addr)
+-{
+-	outb(addr, todc_info->nvram_as0);
+-	outb(addr>>todc_info->as0_bits, todc_info->nvram_as1);
+-	return inb(todc_info->nvram_data);
+-}
+-
+-void
+-todc_m48txx_write_val(int addr, unsigned char val)
+-{
+-	outb(addr, todc_info->nvram_as0);
+-	outb(addr>>todc_info->as0_bits, todc_info->nvram_as1);
+-	outb(val, todc_info->nvram_data);
+-	return;
+-}
+-
+-/* Access routines for accessing mc146818 type chips via addr/data regs */
+-u_char
+-todc_mc146818_read_val(int addr)
+-{
+-	outb_p(addr, todc_info->nvram_as0);
+-	return inb_p(todc_info->nvram_data);
+-}
+-
+-void
+-todc_mc146818_write_val(int addr, unsigned char val)
+-{
+-	outb_p(addr, todc_info->nvram_as0);
+-	outb_p(val, todc_info->nvram_data);
+-}
+-
+-
+-/*
+- * Routines to make RTC chips with NVRAM buried behind an addr/data pair
+- * have the NVRAM and clock regs appear at the same level.
+- * The NVRAM will appear to start at addr 0 and the clock regs will appear
+- * to start immediately after the NVRAM (actually, start at offset
+- * todc_info->nvram_size).
+- */
+-static inline u_char
+-todc_read_val(int addr)
+-{
+-	u_char	val;
+-
+-	if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) {
+-		if (addr < todc_info->nvram_size) { /* NVRAM */
+-			ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr);
+-			val = ppc_md.rtc_read_val(todc_info->nvram_data_reg);
+-		} else { /* Clock Reg */
+-			addr -= todc_info->nvram_size;
+-			val = ppc_md.rtc_read_val(addr);
+-		}
+-	} else
+-		val = ppc_md.rtc_read_val(addr);
+-
+-	return val;
+-}
+-
+-static inline void
+-todc_write_val(int addr, u_char val)
+-{
+-	if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) {
+-		if (addr < todc_info->nvram_size) { /* NVRAM */
+-			ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr);
+-			ppc_md.rtc_write_val(todc_info->nvram_data_reg, val);
+-		} else { /* Clock Reg */
+-			addr -= todc_info->nvram_size;
+-			ppc_md.rtc_write_val(addr, val);
+-		}
+-	} else
+-		ppc_md.rtc_write_val(addr, val);
+-}
+-
+-/*
+- * TODC routines
+- *
+- * There is some ugly stuff in that there are assumptions for the mc146818.
+- *
+- * Assumptions:
+- *	- todc_info->control_a has the offset as mc146818 Register B reg
+- *	- todc_info->control_b has the offset as mc146818 Register A reg
+- *	- m48txx control reg's write enable or 'W' bit is same as
+- *	  mc146818 Register B 'SET' bit (i.e., 0x80)
+- *
+- * These assumptions were made to make the code simpler.
+- */
+-long __init
+-todc_time_init(void)
+-{
+-	u_char	cntl_b;
+-
+-	if (!ppc_md.rtc_read_val)
+-		ppc_md.rtc_read_val = ppc_md.nvram_read_val;
+-	if (!ppc_md.rtc_write_val)
+-		ppc_md.rtc_write_val = ppc_md.nvram_write_val;
+-
+-	cntl_b = todc_read_val(todc_info->control_b);
+-
+-	if (todc_info->rtc_type == TODC_TYPE_MC146818) {
+-		if ((cntl_b & 0x70) != 0x20) {
+-			printk(KERN_INFO "TODC real-time-clock was stopped."
+-				"  Now starting...");
+-			cntl_b &= ~0x70;
+-			cntl_b |= 0x20;
+-		}
+-
+-		todc_write_val(todc_info->control_b, cntl_b);
+-	} else if (todc_info->rtc_type == TODC_TYPE_DS17285) {
+-		u_char mode;
+-
+-		mode = todc_read_val(TODC_TYPE_DS17285_CNTL_A);
+-		/* Make sure countdown clear is not set */
+-		mode &= ~0x40;
+-		/* Enable oscillator, extended register set */
+-		mode |= 0x30;
+-		todc_write_val(TODC_TYPE_DS17285_CNTL_A, mode);
+-
+-	} else if (todc_info->rtc_type == TODC_TYPE_DS1501) {
+-		u_char	month;
+-
+-		todc_info->enable_read = TODC_DS1501_CNTL_B_TE;
+-		todc_info->enable_write = TODC_DS1501_CNTL_B_TE;
+-
+-		month = todc_read_val(todc_info->month);
+-
+-		if ((month & 0x80) == 0x80) {
+-			printk(KERN_INFO "TODC %s %s\n",
+-				"real-time-clock was stopped.",
+-				"Now starting...");
+-			month &= ~0x80;
+-			todc_write_val(todc_info->month, month);
+-		}
+-
+-		cntl_b &= ~TODC_DS1501_CNTL_B_TE;
+-		todc_write_val(todc_info->control_b, cntl_b);
+-	} else { /* must be a m48txx type */
+-		u_char	cntl_a;
+-
+-		todc_info->enable_read = TODC_MK48TXX_CNTL_A_R;
+-		todc_info->enable_write = TODC_MK48TXX_CNTL_A_W;
+-
+-		cntl_a = todc_read_val(todc_info->control_a);
+-
+-		/* Check & clear STOP bit in control B register */
+-		if (cntl_b & TODC_MK48TXX_DAY_CB) {
+-			printk(KERN_INFO "TODC %s %s\n",
+-				"real-time-clock was stopped.",
+-				"Now starting...");
+-
+-			cntl_a |= todc_info->enable_write;
+-			cntl_b &= ~TODC_MK48TXX_DAY_CB;/* Start Oscil */
+-
+-			todc_write_val(todc_info->control_a, cntl_a);
+-			todc_write_val(todc_info->control_b, cntl_b);
+-		}
+-
+-		/* Make sure READ & WRITE bits are cleared. */
+-		cntl_a &= ~(todc_info->enable_write | todc_info->enable_read);
+-		todc_write_val(todc_info->control_a, cntl_a);
+-	}
+-
+-	return 0;
+-}
+-
+-/*
+- * There is some ugly stuff in that there are assumptions that for a mc146818,
+- * the todc_info->control_a has the offset of the mc146818 Register B reg and
+- * that the register'ss 'SET' bit is the same as the m48txx's write enable
+- * bit in the control register of the m48txx (i.e., 0x80).
+- *
+- * It was done to make the code look simpler.
+- */
+-void
+-todc_get_rtc_time(struct rtc_time *tm)
+-{
+-	uint	year = 0, mon = 0, mday = 0, hour = 0, min = 0, sec = 0;
+-	uint	limit, i;
+-	u_char	save_control, uip = 0;
+-	extern void GregorianDay(struct rtc_time *);
+-
+-	spin_lock(&rtc_lock);
+-	save_control = todc_read_val(todc_info->control_a);
+-
+-	if (todc_info->rtc_type != TODC_TYPE_MC146818) {
+-		limit = 1;
+-
+-		switch (todc_info->rtc_type) {
+-		case TODC_TYPE_DS1553:
+-		case TODC_TYPE_DS1557:
+-		case TODC_TYPE_DS1743:
+-		case TODC_TYPE_DS1746:	/* XXXX BAD HACK -> FIX */
+-		case TODC_TYPE_DS1747:
+-		case TODC_TYPE_DS17285:
+-			break;
+-		default:
+-			todc_write_val(todc_info->control_a,
+-				(save_control | todc_info->enable_read));
+-		}
+-	} else
+-		limit = 100000000;
+-
+-	for (i=0; i<limit; i++) {
+-		if (todc_info->rtc_type == TODC_TYPE_MC146818)
+-			uip = todc_read_val(todc_info->RTC_FREQ_SELECT);
+-
+-		sec = todc_read_val(todc_info->seconds) & 0x7f;
+-		min = todc_read_val(todc_info->minutes) & 0x7f;
+-		hour = todc_read_val(todc_info->hours) & 0x3f;
+-		mday = todc_read_val(todc_info->day_of_month) & 0x3f;
+-		mon = todc_read_val(todc_info->month) & 0x1f;
+-		year = todc_read_val(todc_info->year) & 0xff;
+-
+-		if (todc_info->rtc_type == TODC_TYPE_MC146818) {
+-			uip |= todc_read_val(todc_info->RTC_FREQ_SELECT);
+-			if ((uip & RTC_UIP) == 0)
+-				break;
+-		}
+-	}
+-
+-	if (todc_info->rtc_type != TODC_TYPE_MC146818) {
+-		switch (todc_info->rtc_type) {
+-		case TODC_TYPE_DS1553:
+-		case TODC_TYPE_DS1557:
+-		case TODC_TYPE_DS1743:
+-		case TODC_TYPE_DS1746:	/* XXXX BAD HACK -> FIX */
+-		case TODC_TYPE_DS1747:
+-		case TODC_TYPE_DS17285:
+-			break;
+-		default:
+-			save_control &= ~(todc_info->enable_read);
+-			todc_write_val(todc_info->control_a, save_control);
+-		}
+-	}
+-	spin_unlock(&rtc_lock);
+-
+-	if ((todc_info->rtc_type != TODC_TYPE_MC146818)
+-			|| ((save_control & RTC_DM_BINARY) == 0)
+-			|| RTC_ALWAYS_BCD) {
+-		BCD_TO_BIN(sec);
+-		BCD_TO_BIN(min);
+-		BCD_TO_BIN(hour);
+-		BCD_TO_BIN(mday);
+-		BCD_TO_BIN(mon);
+-		BCD_TO_BIN(year);
+-	}
+-
+-	if ((year + 1900) < 1970) {
+-		year += 100;
+-	}
+-
+-	tm->tm_sec = sec;
+-	tm->tm_min = min;
+-	tm->tm_hour = hour;
+-	tm->tm_mday = mday;
+-	tm->tm_mon = mon;
+-	tm->tm_year = year;
+-
+-	GregorianDay(tm);
+-}
+-
+-int
+-todc_set_rtc_time(struct rtc_time *tm)
+-{
+-	u_char save_control, save_freq_select = 0;
+-
+-	spin_lock(&rtc_lock);
+-	save_control = todc_read_val(todc_info->control_a);
+-
+-	/* Assuming MK48T59_RTC_CA_WRITE & RTC_SET are equal */
+-	todc_write_val(todc_info->control_a,
+-		(save_control | todc_info->enable_write));
+-	save_control &= ~(todc_info->enable_write); /* in case it was set */
+-
+-	if (todc_info->rtc_type == TODC_TYPE_MC146818) {
+-		save_freq_select = todc_read_val(todc_info->RTC_FREQ_SELECT);
+-		todc_write_val(todc_info->RTC_FREQ_SELECT,
+-			save_freq_select | RTC_DIV_RESET2);
+-	}
+-
+-	if ((todc_info->rtc_type != TODC_TYPE_MC146818)
+-			|| ((save_control & RTC_DM_BINARY) == 0)
+-			|| RTC_ALWAYS_BCD) {
+-		BIN_TO_BCD(tm->tm_sec);
+-		BIN_TO_BCD(tm->tm_min);
+-		BIN_TO_BCD(tm->tm_hour);
+-		BIN_TO_BCD(tm->tm_mon);
+-		BIN_TO_BCD(tm->tm_mday);
+-		BIN_TO_BCD(tm->tm_year);
+-	}
+-
+-	todc_write_val(todc_info->seconds, tm->tm_sec);
+-	todc_write_val(todc_info->minutes, tm->tm_min);
+-	todc_write_val(todc_info->hours, tm->tm_hour);
+-	todc_write_val(todc_info->month, tm->tm_mon);
+-	todc_write_val(todc_info->day_of_month, tm->tm_mday);
+-	todc_write_val(todc_info->year, tm->tm_year);
+-
+-	todc_write_val(todc_info->control_a, save_control);
+-
+-	if (todc_info->rtc_type == TODC_TYPE_MC146818)
+-		todc_write_val(todc_info->RTC_FREQ_SELECT, save_freq_select);
+-
+-	spin_unlock(&rtc_lock);
+-	return 0;
+-}
+Index: working-2.6/include/asm-powerpc/todc.h
+===================================================================
+--- working-2.6.orig/include/asm-powerpc/todc.h	2006-08-25 14:27:15.000000000 +1000
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,487 +0,0 @@ 
+-/*
+- * Definitions for the M48Txx and mc146818 series of Time of day/Real Time
+- * Clock chips.
+- *
+- * Author: Mark A. Greer <mgreer@mvista.com>
+- *
+- * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
+- * the terms of the GNU General Public License version 2.  This program
+- * is licensed "as is" without any warranty of any kind, whether express
+- * or implied.
+- */
+-
+-/*
+- * Support for the M48T37/M48T59/.../mc146818 Real Time Clock chips.
+- * Purpose is to make one generic file that handles all of these chips instead
+- * of every platform implementing the same code over & over again.
+- */
+-
+-#ifndef __PPC_KERNEL_TODC_H
+-#define __PPC_KERNEL_TODC_H
+-
+-typedef struct {
+-	uint rtc_type;		/* your particular chip */
+-
+-	/*
+-	 * Following are the addresses of the AS0, AS1, and DATA registers
+-	 * of these chips.  Note that these are board-specific.
+-	 */
+-	unsigned int nvram_as0;
+-	unsigned int nvram_as1;
+-	unsigned int nvram_data;
+-
+-	/*
+-	 * Define bits to stop external set of regs from changing so
+-	 * the chip can be read/written reliably.
+-	 */
+-	unsigned char enable_read;
+-	unsigned char enable_write;
+-
+-	/*
+-	 * Following is the number of AS0 address bits.  This is normally
+-	 * 8 but some bad hardware routes address lines incorrectly.
+-	 */
+-	int as0_bits;
+-
+-	int nvram_size;	/* Size of NVRAM on chip */
+-	int sw_flags;	/* Software control flags */
+-
+-	/* Following are the register offsets for the particular chip */
+-	int year;
+-	int month;
+-	int day_of_month;
+-	int day_of_week;
+-	int hours;
+-	int minutes;
+-	int seconds;
+-	int control_b;
+-	int control_a;
+-	int watchdog;
+-	int interrupts;
+-	int alarm_date;
+-	int alarm_hour;
+-	int alarm_minutes;
+-	int alarm_seconds;
+-	int century;
+-	int flags;
+-
+-	/*
+-	 * Some RTC chips have their NVRAM buried behind a addr/data pair of
+-	 * regs on the first level/clock registers.  The following fields
+-	 * are the addresses for those addr/data regs.
+-	 */
+-	int nvram_addr_reg;
+-	int nvram_data_reg;
+-} todc_info_t;
+-
+-/*
+- * Define the types of TODC/RTC variants that are supported in
+- * arch/ppc/kernel/todc_time.c
+- * Make a new one of these for any chip somehow differs from what's already
+- * defined.  That way, if you ever need to put in code to touch those
+- * bits/registers in todc_time.c, you can put it inside an
+- * 'if (todc_info->rtc_type == TODC_TYPE_XXX)' so you won't break
+- * anyone else.
+- */
+-#define TODC_TYPE_MK48T35		1
+-#define TODC_TYPE_MK48T37		2
+-#define TODC_TYPE_MK48T59		3
+-#define TODC_TYPE_DS1693		4	/* Dallas DS1693 RTC */
+-#define TODC_TYPE_DS1743		5	/* Dallas DS1743 RTC */
+-#define TODC_TYPE_DS1746		6	/* Dallas DS1746 RTC */
+-#define TODC_TYPE_DS1747		7	/* Dallas DS1747 RTC */
+-#define TODC_TYPE_DS1501		8	/* Dallas DS1501 RTC */
+-#define TODC_TYPE_DS1643		9	/* Dallas DS1643 RTC */
+-#define TODC_TYPE_PC97307		10	/* PC97307 internal RTC */
+-#define TODC_TYPE_DS1557		11	/* Dallas DS1557 RTC */
+-#define TODC_TYPE_DS17285		12	/* Dallas DS17285 RTC */
+-#define TODC_TYPE_DS1553		13	/* Dallas DS1553 RTC */
+-#define TODC_TYPE_MC146818		100	/* Leave room for m48txx's */
+-
+-/*
+- * Bit to clear/set to enable reads/writes to the chip
+- */
+-#define TODC_MK48TXX_CNTL_A_R		0x40
+-#define TODC_MK48TXX_CNTL_A_W		0x80
+-#define TODC_MK48TXX_DAY_CB		0x80
+-
+-#define TODC_DS1501_CNTL_B_TE		0x80
+-
+-/*
+- * Define flag bits used by todc routines.
+- */
+-#define TODC_FLAG_2_LEVEL_NVRAM		0x00000001
+-
+-/*
+- * Define the values for the various RTC's that should to into the todc_info
+- * table.
+- * Note: The XXX_NVRAM_SIZE, XXX_NVRAM_ADDR_REG, and XXX_NVRAM_DATA_REG only
+- * matter if XXX_SW_FLAGS has TODC_FLAG_2_LEVEL_NVRAM set.
+- */
+-#define TODC_TYPE_MK48T35_NVRAM_SIZE		0x7ff8
+-#define TODC_TYPE_MK48T35_SW_FLAGS		0
+-#define TODC_TYPE_MK48T35_YEAR			0x7fff
+-#define TODC_TYPE_MK48T35_MONTH			0x7ffe
+-#define TODC_TYPE_MK48T35_DOM			0x7ffd	/* Day of Month */
+-#define TODC_TYPE_MK48T35_DOW			0x7ffc	/* Day of Week */
+-#define TODC_TYPE_MK48T35_HOURS			0x7ffb
+-#define TODC_TYPE_MK48T35_MINUTES		0x7ffa
+-#define TODC_TYPE_MK48T35_SECONDS		0x7ff9
+-#define TODC_TYPE_MK48T35_CNTL_B		0x7ff9
+-#define TODC_TYPE_MK48T35_CNTL_A		0x7ff8
+-#define TODC_TYPE_MK48T35_WATCHDOG		0x0000
+-#define TODC_TYPE_MK48T35_INTERRUPTS		0x0000
+-#define TODC_TYPE_MK48T35_ALARM_DATE		0x0000
+-#define TODC_TYPE_MK48T35_ALARM_HOUR		0x0000
+-#define TODC_TYPE_MK48T35_ALARM_MINUTES		0x0000
+-#define TODC_TYPE_MK48T35_ALARM_SECONDS		0x0000
+-#define TODC_TYPE_MK48T35_CENTURY		0x0000
+-#define TODC_TYPE_MK48T35_FLAGS			0x0000
+-#define TODC_TYPE_MK48T35_NVRAM_ADDR_REG	0
+-#define TODC_TYPE_MK48T35_NVRAM_DATA_REG	0
+-
+-#define TODC_TYPE_MK48T37_NVRAM_SIZE		0x7ff0
+-#define TODC_TYPE_MK48T37_SW_FLAGS		0
+-#define TODC_TYPE_MK48T37_YEAR			0x7fff
+-#define TODC_TYPE_MK48T37_MONTH			0x7ffe
+-#define TODC_TYPE_MK48T37_DOM			0x7ffd	/* Day of Month */
+-#define TODC_TYPE_MK48T37_DOW			0x7ffc	/* Day of Week */
+-#define TODC_TYPE_MK48T37_HOURS			0x7ffb
+-#define TODC_TYPE_MK48T37_MINUTES		0x7ffa
+-#define TODC_TYPE_MK48T37_SECONDS		0x7ff9
+-#define TODC_TYPE_MK48T37_CNTL_B		0x7ff9
+-#define TODC_TYPE_MK48T37_CNTL_A		0x7ff8
+-#define TODC_TYPE_MK48T37_WATCHDOG		0x7ff7
+-#define TODC_TYPE_MK48T37_INTERRUPTS		0x7ff6
+-#define TODC_TYPE_MK48T37_ALARM_DATE		0x7ff5
+-#define TODC_TYPE_MK48T37_ALARM_HOUR		0x7ff4
+-#define TODC_TYPE_MK48T37_ALARM_MINUTES		0x7ff3
+-#define TODC_TYPE_MK48T37_ALARM_SECONDS		0x7ff2
+-#define TODC_TYPE_MK48T37_CENTURY		0x7ff1
+-#define TODC_TYPE_MK48T37_FLAGS			0x7ff0
+-#define TODC_TYPE_MK48T37_NVRAM_ADDR_REG	0
+-#define TODC_TYPE_MK48T37_NVRAM_DATA_REG	0
+-
+-#define TODC_TYPE_MK48T59_NVRAM_SIZE		0x1ff0
+-#define TODC_TYPE_MK48T59_SW_FLAGS		0
+-#define TODC_TYPE_MK48T59_YEAR			0x1fff
+-#define TODC_TYPE_MK48T59_MONTH			0x1ffe
+-#define TODC_TYPE_MK48T59_DOM			0x1ffd	/* Day of Month */
+-#define TODC_TYPE_MK48T59_DOW			0x1ffc	/* Day of Week */
+-#define TODC_TYPE_MK48T59_HOURS			0x1ffb
+-#define TODC_TYPE_MK48T59_MINUTES		0x1ffa
+-#define TODC_TYPE_MK48T59_SECONDS		0x1ff9
+-#define TODC_TYPE_MK48T59_CNTL_B		0x1ff9
+-#define TODC_TYPE_MK48T59_CNTL_A		0x1ff8
+-#define TODC_TYPE_MK48T59_WATCHDOG		0x1fff
+-#define TODC_TYPE_MK48T59_INTERRUPTS		0x1fff
+-#define TODC_TYPE_MK48T59_ALARM_DATE		0x1fff
+-#define TODC_TYPE_MK48T59_ALARM_HOUR		0x1fff
+-#define TODC_TYPE_MK48T59_ALARM_MINUTES		0x1fff
+-#define TODC_TYPE_MK48T59_ALARM_SECONDS		0x1fff
+-#define TODC_TYPE_MK48T59_CENTURY		0x1fff
+-#define TODC_TYPE_MK48T59_FLAGS			0x1fff
+-#define TODC_TYPE_MK48T59_NVRAM_ADDR_REG	0
+-#define TODC_TYPE_MK48T59_NVRAM_DATA_REG	0
+-
+-#define TODC_TYPE_DS1501_NVRAM_SIZE	0x100
+-#define TODC_TYPE_DS1501_SW_FLAGS	TODC_FLAG_2_LEVEL_NVRAM
+-#define TODC_TYPE_DS1501_YEAR		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x06)
+-#define TODC_TYPE_DS1501_MONTH		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x05)
+-#define TODC_TYPE_DS1501_DOM		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x04)
+-#define TODC_TYPE_DS1501_DOW		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x03)
+-#define TODC_TYPE_DS1501_HOURS		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x02)
+-#define TODC_TYPE_DS1501_MINUTES	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x01)
+-#define TODC_TYPE_DS1501_SECONDS	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x00)
+-#define TODC_TYPE_DS1501_CNTL_B		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x0f)
+-#define TODC_TYPE_DS1501_CNTL_A		(TODC_TYPE_DS1501_NVRAM_SIZE + 0x0f)
+-#define TODC_TYPE_DS1501_WATCHDOG	(TODC_TYPE_DS1501_NVRAM_SIZE + 0xff)
+-#define TODC_TYPE_DS1501_INTERRUPTS	(TODC_TYPE_DS1501_NVRAM_SIZE + 0xff)
+-#define TODC_TYPE_DS1501_ALARM_DATE	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x0b)
+-#define TODC_TYPE_DS1501_ALARM_HOUR	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x0a)
+-#define TODC_TYPE_DS1501_ALARM_MINUTES	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x09)
+-#define TODC_TYPE_DS1501_ALARM_SECONDS	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x08)
+-#define TODC_TYPE_DS1501_CENTURY	(TODC_TYPE_DS1501_NVRAM_SIZE + 0x07)
+-#define TODC_TYPE_DS1501_FLAGS		(TODC_TYPE_DS1501_NVRAM_SIZE + 0xff)
+-#define TODC_TYPE_DS1501_NVRAM_ADDR_REG	0x10
+-#define TODC_TYPE_DS1501_NVRAM_DATA_REG	0x13
+-
+-#define TODC_TYPE_DS1553_NVRAM_SIZE		0x1ff0
+-#define TODC_TYPE_DS1553_SW_FLAGS		0
+-#define TODC_TYPE_DS1553_YEAR			0x1fff
+-#define TODC_TYPE_DS1553_MONTH			0x1ffe
+-#define TODC_TYPE_DS1553_DOM			0x1ffd	/* Day of Month */
+-#define TODC_TYPE_DS1553_DOW			0x1ffc	/* Day of Week */
+-#define TODC_TYPE_DS1553_HOURS			0x1ffb
+-#define TODC_TYPE_DS1553_MINUTES		0x1ffa
+-#define TODC_TYPE_DS1553_SECONDS		0x1ff9
+-#define TODC_TYPE_DS1553_CNTL_B			0x1ff9
+-#define TODC_TYPE_DS1553_CNTL_A			0x1ff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1553_WATCHDOG		0x1ff7
+-#define TODC_TYPE_DS1553_INTERRUPTS		0x1ff6
+-#define TODC_TYPE_DS1553_ALARM_DATE		0x1ff5
+-#define TODC_TYPE_DS1553_ALARM_HOUR		0x1ff4
+-#define TODC_TYPE_DS1553_ALARM_MINUTES		0x1ff3
+-#define TODC_TYPE_DS1553_ALARM_SECONDS		0x1ff2
+-#define TODC_TYPE_DS1553_CENTURY		0x1ff8
+-#define TODC_TYPE_DS1553_FLAGS			0x1ff0
+-#define TODC_TYPE_DS1553_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1553_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1557_NVRAM_SIZE		0x7fff0
+-#define TODC_TYPE_DS1557_SW_FLAGS		0
+-#define TODC_TYPE_DS1557_YEAR			0x7ffff
+-#define TODC_TYPE_DS1557_MONTH			0x7fffe
+-#define TODC_TYPE_DS1557_DOM			0x7fffd	/* Day of Month */
+-#define TODC_TYPE_DS1557_DOW			0x7fffc	/* Day of Week */
+-#define TODC_TYPE_DS1557_HOURS			0x7fffb
+-#define TODC_TYPE_DS1557_MINUTES		0x7fffa
+-#define TODC_TYPE_DS1557_SECONDS		0x7fff9
+-#define TODC_TYPE_DS1557_CNTL_B			0x7fff9
+-#define TODC_TYPE_DS1557_CNTL_A			0x7fff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1557_WATCHDOG		0x7fff7
+-#define TODC_TYPE_DS1557_INTERRUPTS		0x7fff6
+-#define TODC_TYPE_DS1557_ALARM_DATE		0x7fff5
+-#define TODC_TYPE_DS1557_ALARM_HOUR		0x7fff4
+-#define TODC_TYPE_DS1557_ALARM_MINUTES		0x7fff3
+-#define TODC_TYPE_DS1557_ALARM_SECONDS		0x7fff2
+-#define TODC_TYPE_DS1557_CENTURY		0x7fff8
+-#define TODC_TYPE_DS1557_FLAGS			0x7fff0
+-#define TODC_TYPE_DS1557_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1557_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1643_NVRAM_SIZE		0x1ff8
+-#define TODC_TYPE_DS1643_SW_FLAGS		0
+-#define TODC_TYPE_DS1643_YEAR			0x1fff
+-#define TODC_TYPE_DS1643_MONTH			0x1ffe
+-#define TODC_TYPE_DS1643_DOM			0x1ffd	/* Day of Month */
+-#define TODC_TYPE_DS1643_DOW			0x1ffc	/* Day of Week */
+-#define TODC_TYPE_DS1643_HOURS			0x1ffb
+-#define TODC_TYPE_DS1643_MINUTES		0x1ffa
+-#define TODC_TYPE_DS1643_SECONDS		0x1ff9
+-#define TODC_TYPE_DS1643_CNTL_B			0x1ff9
+-#define TODC_TYPE_DS1643_CNTL_A			0x1ff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1643_WATCHDOG		0x1fff
+-#define TODC_TYPE_DS1643_INTERRUPTS		0x1fff
+-#define TODC_TYPE_DS1643_ALARM_DATE		0x1fff
+-#define TODC_TYPE_DS1643_ALARM_HOUR		0x1fff
+-#define TODC_TYPE_DS1643_ALARM_MINUTES		0x1fff
+-#define TODC_TYPE_DS1643_ALARM_SECONDS		0x1fff
+-#define TODC_TYPE_DS1643_CENTURY		0x1ff8
+-#define TODC_TYPE_DS1643_FLAGS			0x1fff
+-#define TODC_TYPE_DS1643_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1643_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1693_NVRAM_SIZE		0 /* Not handled yet */
+-#define TODC_TYPE_DS1693_SW_FLAGS		0
+-#define TODC_TYPE_DS1693_YEAR			0x09
+-#define TODC_TYPE_DS1693_MONTH			0x08
+-#define TODC_TYPE_DS1693_DOM			0x07	/* Day of Month */
+-#define TODC_TYPE_DS1693_DOW			0x06	/* Day of Week */
+-#define TODC_TYPE_DS1693_HOURS			0x04
+-#define TODC_TYPE_DS1693_MINUTES		0x02
+-#define TODC_TYPE_DS1693_SECONDS		0x00
+-#define TODC_TYPE_DS1693_CNTL_B			0x0b
+-#define TODC_TYPE_DS1693_CNTL_A			0x0a
+-#define TODC_TYPE_DS1693_WATCHDOG		0xff
+-#define TODC_TYPE_DS1693_INTERRUPTS		0xff
+-#define TODC_TYPE_DS1693_ALARM_DATE		0x49
+-#define TODC_TYPE_DS1693_ALARM_HOUR		0x05
+-#define TODC_TYPE_DS1693_ALARM_MINUTES		0x03
+-#define TODC_TYPE_DS1693_ALARM_SECONDS		0x01
+-#define TODC_TYPE_DS1693_CENTURY		0x48
+-#define TODC_TYPE_DS1693_FLAGS			0xff
+-#define TODC_TYPE_DS1693_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1693_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1743_NVRAM_SIZE		0x1ff8
+-#define TODC_TYPE_DS1743_SW_FLAGS		0
+-#define TODC_TYPE_DS1743_YEAR			0x1fff
+-#define TODC_TYPE_DS1743_MONTH			0x1ffe
+-#define TODC_TYPE_DS1743_DOM			0x1ffd	/* Day of Month */
+-#define TODC_TYPE_DS1743_DOW			0x1ffc	/* Day of Week */
+-#define TODC_TYPE_DS1743_HOURS			0x1ffb
+-#define TODC_TYPE_DS1743_MINUTES		0x1ffa
+-#define TODC_TYPE_DS1743_SECONDS		0x1ff9
+-#define TODC_TYPE_DS1743_CNTL_B			0x1ff9
+-#define TODC_TYPE_DS1743_CNTL_A			0x1ff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1743_WATCHDOG		0x1fff
+-#define TODC_TYPE_DS1743_INTERRUPTS		0x1fff
+-#define TODC_TYPE_DS1743_ALARM_DATE		0x1fff
+-#define TODC_TYPE_DS1743_ALARM_HOUR		0x1fff
+-#define TODC_TYPE_DS1743_ALARM_MINUTES		0x1fff
+-#define TODC_TYPE_DS1743_ALARM_SECONDS		0x1fff
+-#define TODC_TYPE_DS1743_CENTURY		0x1ff8
+-#define TODC_TYPE_DS1743_FLAGS			0x1fff
+-#define TODC_TYPE_DS1743_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1743_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1746_NVRAM_SIZE		0x1fff8
+-#define TODC_TYPE_DS1746_SW_FLAGS		0
+-#define TODC_TYPE_DS1746_YEAR			0x1ffff
+-#define TODC_TYPE_DS1746_MONTH			0x1fffe
+-#define TODC_TYPE_DS1746_DOM			0x1fffd	/* Day of Month */
+-#define TODC_TYPE_DS1746_DOW			0x1fffc	/* Day of Week */
+-#define TODC_TYPE_DS1746_HOURS			0x1fffb
+-#define TODC_TYPE_DS1746_MINUTES		0x1fffa
+-#define TODC_TYPE_DS1746_SECONDS		0x1fff9
+-#define TODC_TYPE_DS1746_CNTL_B			0x1fff9
+-#define TODC_TYPE_DS1746_CNTL_A			0x1fff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1746_WATCHDOG		0x00000
+-#define TODC_TYPE_DS1746_INTERRUPTS		0x00000
+-#define TODC_TYPE_DS1746_ALARM_DATE		0x00000
+-#define TODC_TYPE_DS1746_ALARM_HOUR		0x00000
+-#define TODC_TYPE_DS1746_ALARM_MINUTES		0x00000
+-#define TODC_TYPE_DS1746_ALARM_SECONDS		0x00000
+-#define TODC_TYPE_DS1746_CENTURY		0x00000
+-#define TODC_TYPE_DS1746_FLAGS			0x00000
+-#define TODC_TYPE_DS1746_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1746_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS1747_NVRAM_SIZE		0x7fff8
+-#define TODC_TYPE_DS1747_SW_FLAGS		0
+-#define TODC_TYPE_DS1747_YEAR			0x7ffff
+-#define TODC_TYPE_DS1747_MONTH			0x7fffe
+-#define TODC_TYPE_DS1747_DOM			0x7fffd	/* Day of Month */
+-#define TODC_TYPE_DS1747_DOW			0x7fffc	/* Day of Week */
+-#define TODC_TYPE_DS1747_HOURS			0x7fffb
+-#define TODC_TYPE_DS1747_MINUTES		0x7fffa
+-#define TODC_TYPE_DS1747_SECONDS		0x7fff9
+-#define TODC_TYPE_DS1747_CNTL_B			0x7fff9
+-#define TODC_TYPE_DS1747_CNTL_A			0x7fff8	/* control_a R/W regs */
+-#define TODC_TYPE_DS1747_WATCHDOG		0x00000
+-#define TODC_TYPE_DS1747_INTERRUPTS		0x00000
+-#define TODC_TYPE_DS1747_ALARM_DATE		0x00000
+-#define TODC_TYPE_DS1747_ALARM_HOUR		0x00000
+-#define TODC_TYPE_DS1747_ALARM_MINUTES		0x00000
+-#define TODC_TYPE_DS1747_ALARM_SECONDS		0x00000
+-#define TODC_TYPE_DS1747_CENTURY		0x00000
+-#define TODC_TYPE_DS1747_FLAGS			0x00000
+-#define TODC_TYPE_DS1747_NVRAM_ADDR_REG		0
+-#define TODC_TYPE_DS1747_NVRAM_DATA_REG		0
+-
+-#define TODC_TYPE_DS17285_NVRAM_SIZE		(0x1000-0x80) /* 4Kx8 NVRAM (minus RTC regs) */
+-#define TODC_TYPE_DS17285_SW_FLAGS		TODC_FLAG_2_LEVEL_NVRAM
+-#define TODC_TYPE_DS17285_SECONDS		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x00)
+-#define TODC_TYPE_DS17285_ALARM_SECONDS		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x01)
+-#define TODC_TYPE_DS17285_MINUTES		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x02)
+-#define TODC_TYPE_DS17285_ALARM_MINUTES		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x03)
+-#define TODC_TYPE_DS17285_HOURS			(TODC_TYPE_DS17285_NVRAM_SIZE + 0x04)
+-#define TODC_TYPE_DS17285_ALARM_HOUR		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x05)
+-#define TODC_TYPE_DS17285_DOW			(TODC_TYPE_DS17285_NVRAM_SIZE + 0x06)
+-#define TODC_TYPE_DS17285_DOM			(TODC_TYPE_DS17285_NVRAM_SIZE + 0x07)
+-#define TODC_TYPE_DS17285_MONTH			(TODC_TYPE_DS17285_NVRAM_SIZE + 0x08)
+-#define TODC_TYPE_DS17285_YEAR			(TODC_TYPE_DS17285_NVRAM_SIZE + 0x09)
+-#define TODC_TYPE_DS17285_CNTL_A		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x0A)
+-#define TODC_TYPE_DS17285_CNTL_B		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x0B)
+-#define TODC_TYPE_DS17285_CNTL_C		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x0C)
+-#define TODC_TYPE_DS17285_CNTL_D		(TODC_TYPE_DS17285_NVRAM_SIZE + 0x0D)
+-#define TODC_TYPE_DS17285_WATCHDOG		0
+-#define TODC_TYPE_DS17285_INTERRUPTS		0
+-#define TODC_TYPE_DS17285_ALARM_DATE		0
+-#define TODC_TYPE_DS17285_CENTURY		0
+-#define TODC_TYPE_DS17285_FLAGS			0
+-#define TODC_TYPE_DS17285_NVRAM_ADDR_REG	0x50
+-#define TODC_TYPE_DS17285_NVRAM_DATA_REG	0x53
+-
+-#define TODC_TYPE_MC146818_NVRAM_SIZE		0	/* XXXX */
+-#define TODC_TYPE_MC146818_SW_FLAGS		0
+-#define TODC_TYPE_MC146818_YEAR			0x09
+-#define TODC_TYPE_MC146818_MONTH		0x08
+-#define TODC_TYPE_MC146818_DOM			0x07	/* Day of Month */
+-#define TODC_TYPE_MC146818_DOW			0x06	/* Day of Week */
+-#define TODC_TYPE_MC146818_HOURS		0x04
+-#define TODC_TYPE_MC146818_MINUTES		0x02
+-#define TODC_TYPE_MC146818_SECONDS		0x00
+-#define TODC_TYPE_MC146818_CNTL_B		0x0a
+-#define TODC_TYPE_MC146818_CNTL_A		0x0b	/* control_a R/W regs */
+-#define TODC_TYPE_MC146818_WATCHDOG		0
+-#define TODC_TYPE_MC146818_INTERRUPTS		0x0c
+-#define TODC_TYPE_MC146818_ALARM_DATE		0xff
+-#define TODC_TYPE_MC146818_ALARM_HOUR		0x05
+-#define TODC_TYPE_MC146818_ALARM_MINUTES	0x03
+-#define TODC_TYPE_MC146818_ALARM_SECONDS	0x01
+-#define TODC_TYPE_MC146818_CENTURY		0xff
+-#define TODC_TYPE_MC146818_FLAGS		0xff
+-#define TODC_TYPE_MC146818_NVRAM_ADDR_REG	0
+-#define TODC_TYPE_MC146818_NVRAM_DATA_REG	0
+-
+-#define TODC_TYPE_PC97307_NVRAM_SIZE		0	/* No NVRAM? */
+-#define TODC_TYPE_PC97307_SW_FLAGS		0
+-#define TODC_TYPE_PC97307_YEAR			0x09
+-#define TODC_TYPE_PC97307_MONTH			0x08
+-#define TODC_TYPE_PC97307_DOM			0x07	/* Day of Month */
+-#define TODC_TYPE_PC97307_DOW			0x06	/* Day of Week */
+-#define TODC_TYPE_PC97307_HOURS			0x04
+-#define TODC_TYPE_PC97307_MINUTES		0x02
+-#define TODC_TYPE_PC97307_SECONDS		0x00
+-#define TODC_TYPE_PC97307_CNTL_B		0x0a
+-#define TODC_TYPE_PC97307_CNTL_A		0x0b	/* control_a R/W regs */
+-#define TODC_TYPE_PC97307_WATCHDOG		0x0c
+-#define TODC_TYPE_PC97307_INTERRUPTS		0x0d
+-#define TODC_TYPE_PC97307_ALARM_DATE		0xff
+-#define TODC_TYPE_PC97307_ALARM_HOUR		0x05
+-#define TODC_TYPE_PC97307_ALARM_MINUTES		0x03
+-#define TODC_TYPE_PC97307_ALARM_SECONDS		0x01
+-#define TODC_TYPE_PC97307_CENTURY		0xff
+-#define TODC_TYPE_PC97307_FLAGS			0xff
+-#define TODC_TYPE_PC97307_NVRAM_ADDR_REG	0
+-#define TODC_TYPE_PC97307_NVRAM_DATA_REG	0
+-
+-/*
+- * Define macros to allocate and init the todc_info_t table that will
+- * be used by the todc_time.c routines.
+- */
+-#define TODC_ALLOC()							\
+-	static todc_info_t todc_info_alloc;				\
+-	todc_info_t *todc_info = &todc_info_alloc;
+-
+-#define TODC_INIT(clock_type, as0, as1, data, bits) {			\
+-	todc_info->rtc_type = clock_type;				\
+-									\
+-	todc_info->nvram_as0 = (unsigned int)(as0);			\
+-	todc_info->nvram_as1 = (unsigned int)(as1);			\
+-	todc_info->nvram_data = (unsigned int)(data);			\
+-									\
+-	todc_info->as0_bits = (bits);					\
+-									\
+-	todc_info->nvram_size = clock_type ##_NVRAM_SIZE;		\
+-	todc_info->sw_flags = clock_type ##_SW_FLAGS;			\
+-									\
+-	todc_info->year = clock_type ##_YEAR;				\
+-	todc_info->month = clock_type ##_MONTH;				\
+-	todc_info->day_of_month = clock_type ##_DOM;			\
+-	todc_info->day_of_week = clock_type ##_DOW;			\
+-	todc_info->hours = clock_type ##_HOURS;				\
+-	todc_info->minutes = clock_type ##_MINUTES;			\
+-	todc_info->seconds = clock_type ##_SECONDS;			\
+-	todc_info->control_b = clock_type ##_CNTL_B;			\
+-	todc_info->control_a = clock_type ##_CNTL_A;			\
+-	todc_info->watchdog = clock_type ##_WATCHDOG;			\
+-	todc_info->interrupts = clock_type ##_INTERRUPTS;		\
+-	todc_info->alarm_date = clock_type ##_ALARM_DATE;		\
+-	todc_info->alarm_hour = clock_type ##_ALARM_HOUR;		\
+-	todc_info->alarm_minutes = clock_type ##_ALARM_MINUTES;		\
+-	todc_info->alarm_seconds = clock_type ##_ALARM_SECONDS;		\
+-	todc_info->century = clock_type ##_CENTURY;			\
+-	todc_info->flags = clock_type ##_FLAGS;				\
+-									\
+-	todc_info->nvram_addr_reg = clock_type ##_NVRAM_ADDR_REG;	\
+-	todc_info->nvram_data_reg = clock_type ##_NVRAM_DATA_REG;	\
+-}
+-
+-extern todc_info_t *todc_info;
+-
+-unsigned char todc_direct_read_val(int addr);
+-void todc_direct_write_val(int addr, unsigned char val);
+-unsigned char todc_m48txx_read_val(int addr);
+-void todc_m48txx_write_val(int addr, unsigned char val);
+-unsigned char todc_mc146818_read_val(int addr);
+-void todc_mc146818_write_val(int addr, unsigned char val);
+-
+-long todc_time_init(void);
+-void todc_get_rtc_time(struct rtc_time *);
+-int todc_set_rtc_time(struct rtc_time *);
+-void todc_calibrate_decr(void);
+-
+-#endif				/* __PPC_KERNEL_TODC_H */
+Index: working-2.6/arch/powerpc/sysdev/Makefile
+===================================================================
+--- working-2.6.orig/arch/powerpc/sysdev/Makefile	2006-10-03 14:57:15.000000000 +1000
++++ working-2.6/arch/powerpc/sysdev/Makefile	2006-10-03 16:31:48.000000000 +1000
+@@ -10,7 +10,6 @@  obj-$(CONFIG_40x)		+= dcr.o
+ obj-$(CONFIG_U3_DART)		+= dart_iommu.o
+ obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
+ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
+-obj-$(CONFIG_PPC_TODC)		+= todc.o
+ obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
+ 
+ ifeq ($(CONFIG_PPC_MERGE),y)
+Index: working-2.6/arch/powerpc/Kconfig
+===================================================================
+--- working-2.6.orig/arch/powerpc/Kconfig	2006-10-03 16:26:20.000000000 +1000
++++ working-2.6/arch/powerpc/Kconfig	2006-10-03 16:33:10.000000000 +1000
+@@ -584,12 +584,6 @@  config TAU_AVERAGE
+ 
+ 	  If in doubt, say N here.
+ 
+-config PPC_TODC
+-	depends on EMBEDDED6xx
+-	bool "Generic Time-of-day Clock (TODC) support"
+-	---help---
+-	  This adds support for many TODC/RTC chips.
+-
+ endmenu
+ 
+ source arch/powerpc/platforms/embedded6xx/Kconfig
+
+
diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index 89a776e075..61836ac204 100644
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -1,65 +1,43 @@
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
-SECTION = "kernel"
+require linux.inc
+
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
-LICENSE = "GPL"
-PR = "r3"
+
+PR = "r4"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "dht-walnut"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://dht-walnut_defconfig"
-
+           file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
 
-inherit kernel
-
-
 FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
 ARCH = "ppc"
-KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
-
-
-
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config
-}
-
 
 do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
-
-
-
-
 do_install_append () {
         install -d  ${DEPLOY_DIR_IMAGE}
-        install -m 0755 arch/ppc/boot/images/zImage.elf \ 
+	if [ -e arch/ppc/boot/images/zImage.elf ] ; then
+	    cp -a arch/ppc/boot/images/zImage.elf arch/ppc/boot/images/zImage
+            install -m 0755 arch/ppc/boot/images/zImage.elf \ 
                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
+	fi	
         install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/
-        powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S \ 
-               ${DEPLOY_DIR_IMAGE}/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
-        gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
-        mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "ppc405"+${PV} -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz \ 
-                ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin        
-        rm ${DEPLOY_DIR_IMAGE}/vmlinux
-        rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
-
-
 }
 
 
diff --git a/packages/linux/linux-dht-walnut_2.6.23.bb b/packages/linux/linux-dht-walnut_2.6.23.bb
new file mode 100644
index 0000000000..181488190e
--- /dev/null
+++ b/packages/linux/linux-dht-walnut_2.6.23.bb
@@ -0,0 +1,56 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+require linux.inc
+
+DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+DEPENDS = "u-boot"
+
+COMPATIBLE_MACHINE = "dht-walnut"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://defconfig"
+
+S = "${WORKDIR}/linux-${PV}"
+
+FILES_kernel-image = "/boot/zImage.elf"
+
+export OS = "Linux"
+ARCH = "ppc"
+
+do_stage_append () {
+#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
+
+       install -d ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+}
+
+do_install_append () {
+        install -d  ${DEPLOY_DIR_IMAGE}
+	if [ -e arch/ppc/boot/images/zImage.elf ] ; then
+	    cp -a arch/ppc/boot/images/zImage.elf arch/ppc/boot/images/zImage
+            install -m 0755 arch/ppc/boot/images/zImage.elf \ 
+                ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
+	fi	
+        install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/
+}
+
+
+pkg_postinst_kernel () {
+        true
+}
+
+pkg_postrm_kernel () {
+        true
+}
+
+
+
+
diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb
index 630e5a6274..8ef0af6c78 100644
--- a/packages/linux/linux-efika_2.6.20.20.bb
+++ b/packages/linux/linux-efika_2.6.20.20.bb
@@ -63,12 +63,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 do_deploy() {
diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb
index ddf3ee3257..87c769a1ae 100644
--- a/packages/linux/linux-efika_2.6.20.bb
+++ b/packages/linux/linux-efika_2.6.20.bb
@@ -60,12 +60,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index 80a4e69a4a..5f8427ef1e 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -47,12 +47,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 do_deploy() {
diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb
index 9410294020..bd9a1c4060 100644
--- a/packages/linux/linux-magicbox_2.6.18.6.bb
+++ b/packages/linux/linux-magicbox_2.6.18.6.bb
@@ -44,11 +44,11 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb
index 82576776f3..2c79a94e10 100644
--- a/packages/linux/linux-magicbox_2.6.19.2.bb
+++ b/packages/linux/linux-magicbox_2.6.19.2.bb
@@ -77,11 +77,11 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
@@ -93,7 +93,7 @@ do_install_append () {
         powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ 
                  ${DEPLOY_DIR_IMAGE}/linux.bin
         gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
-        cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz        
+        cp -pPR ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz        
         mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \
                 -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin        
         rm ${DEPLOY_DIR_IMAGE}/vmlinux
diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
index 76fa75f65d..77b0bbc326 100644
--- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
@@ -33,12 +33,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb
index 75233492eb..f0408f365c 100644
--- a/packages/linux/linux-ml403-slab-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb
@@ -56,12 +56,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb
index 1fa520e914..49c7878ca2 100644
--- a/packages/linux/linux-sequoia_2.6.21.bb
+++ b/packages/linux/linux-sequoia_2.6.21.bb
@@ -31,12 +31,12 @@ do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
 
        install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
+       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
 
        install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
+       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
 
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index c483ea26a6..47d9a93a15 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -30,21 +30,21 @@ do_stage() {
 	install -d ${STAGING_DIR}/pkgdata/
 	install -d ${STAGING_DIR_TARGET}/shlibs/
 
-	cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
-	cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+	cp -pPRr ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
+	cp -pPRr ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
 
 	if [ -d ${prefix}/ipk ]; then
 		install -d ${DEPLOY_DIR_IPK}/
-		cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
+		cp -pPRr ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
 	fi
 
 	if [ -d ${prefix}/deb ]; then
 		install -d ${DEPLOY_DIR_DEB}/
-		cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
+		cp -pPRr ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
 	fi
 
 	if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then
 		install -d ${DEPLOY_DIR_PSTAGE}/
-		cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
+		cp -pPRr ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
 	fi
 }
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index ca449168a9..c615642e35 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -29,14 +29,23 @@ iface wlan0 inet dhcp
 #	wireless-mode managed                  
 #
 # A WPA1 or WPA2 encrypted connection locked to a specific access point.
-# The WLAN cards firmware is updated temporarily to allow WPA
-# connections. Your card may or may not need the update.
+# This is the best option for non-roaming, single-network usage.
+# Note that your card may require a firmware update to use WPA. 
+# Some distributions install a temporary volatile firmware update on ifup.
 #
 #iface wlan0 inet dhcp                                                   
 #	wpa-essid some-essid                                          
 #	wpa-psk My-PlainText-Password                                              
-#	pre-up iwpriv wlan0 reset 1                                      
-#	pre-up prism2_srec -r wlan0 /etc/pcmcia/rf010804.hex             
+#
+# A WPA1 or WPA2 encrypted connection using an external configuration file
+# for wpa-supplicant. This is the way to go if you need to configure multiple
+# networks with different keys and / or WPA settings and roaming support.
+#
+# iface wlan0 inet dhcp
+#    wpa-conf /etc/wpa_supplicant.conf
+#    wpa-driver hostap
+
+
 
 iface atml0 inet dhcp
 
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 82464d82c6..1f2837a8c1 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r25"
+PR = "r26"
 
 inherit update-rc.d
 
diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index c05b6d3618..4c2c5aad46 100644
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -13,12 +13,12 @@ PACKAGE_ARCH_${PN}-src = "all"
 
 do_configure_prepend() {
 	install -d ${WORKDIR}/source
-	cp -a ${S} ${WORKDIR}/source/
+	cp -pPR ${S} ${WORKDIR}/source/
 	find ${WORKDIR}/source -name ".svn"|xargs rm -rf
 }
 
 do_install_append() {
 	install -d ${D}/usr/local/openmoko/source/
-	cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
+	cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
 }
 
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
new file mode 100644
index 0000000000..058bf176f9
--- /dev/null
+++ b/packages/qmake/qmake2-native.inc
@@ -0,0 +1,67 @@
+DESCRIPTION = "TrollTech Makefile Generator"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r2"
+
+QTVER = "qtopia-core-opensource-src-${QTVERSION}"
+
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
+           file://0001-fix-mkspecs.patch;patch=1 \
+           file://qt-config.patch;patch=1 \
+           file://use-lflags-last.patch;patch=1 \
+           file://linux-oe-qmake.conf"
+S = "${WORKDIR}/${QTVER}"
+
+# we need the real target system here
+CROSS_SYS := "${TARGET_SYS}"
+inherit autotools cross 
+
+export QTDIR = "${S}"
+EXTRA_OEMAKE = "-e"
+
+do_configure() {
+    # Install the OE build templates
+    for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
+    do
+        install -d ${S}/mkspecs/$template
+        install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
+        ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
+    done
+
+    QMAKESPEC=
+    PLATFORM=${HOST_OS}-oe-g++
+    export PLATFORM
+    # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
+    export OE_QMAKE_CC="${CC}"
+    export OE_QMAKE_CFLAGS="${CFLAGS}"
+    export OE_QMAKE_CXX="${CXX}"
+    export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
+    export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+    export OE_QMAKE_LINK="${CCLD}"
+    export OE_QMAKE_AR="${AR}"
+    export OE_QMAKE_STRIP="${STRIP}"
+    export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+    export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+    export OE_QMAKE_RCC="non-existant"
+    export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
+    export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+    echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+}
+
+do_compile() {
+    :
+}
+
+do_stage() {
+    install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
+    install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
+    install -d ${CROSS_DATADIR}/qt4
+    cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
+}
+
+do_install() {
+    :
+}
diff --git a/packages/qte/qtopia-core/.mtn2git_empty b/packages/qmake/qmake2-native/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qtopia-core/.mtn2git_empty
+++ b/packages/qmake/qmake2-native/.mtn2git_empty
diff --git a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
index abebfdfa27..faf0ba028a 100644
--- a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
+++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
@@ -1,4 +1,4 @@
-From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
+From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Sat, 2 Jun 2007 16:39:58 +0200
 Subject: [PATCH] fix mkspecs
@@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
  mkspecs/common/linux.conf |   26 +++++++++++++-------------
  2 files changed, 22 insertions(+), 22 deletions(-)
 
-diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
-index f5a5c8e..4007c7e 100644
---- a/mkspecs/common/g++.conf
-+++ b/mkspecs/common/g++.conf
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 02:58:21.000000000 +0100
 @@ -2,12 +2,12 @@
  # qmake configuration for common gcc
  #
@@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CFLAGS_WARN_ON	+= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	+= -w
 -QMAKE_CFLAGS_RELEASE	+= -O2
-+QMAKE_CFLAGS_RELEASE	+= -O2 
++QMAKE_CFLAGS_RELEASE	+= 
  QMAKE_CFLAGS_DEBUG	+= -g
  QMAKE_CFLAGS_SHLIB	+= -fPIC
  QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
-@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+@@ -16,8 +16,8 @@
  QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
  
@@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
-@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+@@ -30,9 +30,9 @@
  QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
  
@@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=
-@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
+@@ -40,7 +40,7 @@
  QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
  QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
  QMAKE_LFLAGS_THREAD	+=
@@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644
  
  QMAKE_PCH_OUTPUT_EXT    = .gch
  
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 3796a87..52acf16 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 02:58:21.000000000 +0100
+@@ -7,26 +7,26 @@
  
  QMAKE_INCDIR          =
  QMAKE_LIBDIR          =
@@ -103,7 +103,7 @@ index 3796a87..52acf16 100644
  QMAKE_RANLIB          =
  
  QMAKE_TAR             = tar -cf
-@@ -38,11 +38,11 @@ QMAKE_COPY_DIR        = $(COPY) -r
+@@ -38,11 +38,11 @@
  QMAKE_MOVE            = mv -f
  QMAKE_DEL_FILE        = rm -f
  QMAKE_DEL_DIR         = rmdir
@@ -118,6 +118,16 @@ index 3796a87..52acf16 100644
 -include(unix.conf)
 \ No newline at end of file
 +include(unix.conf)
--- 
-1.5.1.6
-
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 03:00:49.000000000 +0100
+@@ -5,7 +5,7 @@
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+ CONFIG			+= qt warn_on release incremental link_prl
+-QT			+= core gui
++QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+ include(../common/g++.conf)
diff --git a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/packages/qmake/qmake2-native/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake2-native/linux-oe-qmake.conf
diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/qmake2-native/qt-config.patch
new file mode 100644
index 0000000000..b2d86de2c5
--- /dev/null
+++ b/packages/qmake/qmake2-native/qt-config.patch
@@ -0,0 +1,27 @@
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp	2007-12-25 00:55:32.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp	2007-12-25 01:20:18.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "qpointer.h"
+ #ifdef QT_BUILD_QMAKE
+ extern QString qmake_libraryInfoFile();
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -107,6 +108,10 @@
+ #ifdef QT_BUILD_QMAKE
+     if(!QFile::exists(qtconfig))
+         qtconfig = qmake_libraryInfoFile();
++    if (!QFile::exists(qtconfig)) {
++        QByteArray config = getenv("QT_CONF_PATH");
++        qtconfig = config;
++    }
+ #else
+     if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
diff --git a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/packages/qmake/qmake2-native/use-lflags-last.patch
index 4197dbbf64..4197dbbf64 100644
--- a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
+++ b/packages/qmake/qmake2-native/use-lflags-last.patch
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index d9071193a9..89b2ae5a82 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -1,67 +1,2 @@
-DESCRIPTION = "TrollTech Makefile Generator"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r2"
-
-QTVER = "qtopia-core-opensource-src-4.3.2"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
-           file://0001-fix-mkspecs.patch;patch=1 \
-           file://use-lflags-last.patch;patch=1 \
-           file://linux-oe-qmake.conf"
-S = "${WORKDIR}/${QTVER}"
-
-# we need the real target system here
-CROSS_SYS := "${TARGET_SYS}"
-inherit autotools cross 
-
-export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
-
-do_configure() {
-        # Install the OE build templates
-        for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-        do
-                install -d ${S}/mkspecs/$template
-                install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-        done
-
-	QMAKESPEC=
-	PLATFORM=${HOST_OS}-oe-g++
-	export PLATFORM
-	# yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
-	export OE_QMAKE_CC="${CC}"
-	export OE_QMAKE_CFLAGS="${CFLAGS}"
-	export OE_QMAKE_CXX="${CXX}"
-	export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
-	export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-	export OE_QMAKE_LINK="${CCLD}"
-	export OE_QMAKE_AR="${AR}"
-	export OE_QMAKE_STRIP="${STRIP}"
-	export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
-	export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
-	export OE_QMAKE_RCC="non-existant"
-	export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
-	export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-	echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-	:
-}
-
-do_stage() {
-	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
-	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
-	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
-	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
-	install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
-	cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
-}
-
-do_install() {
-        :
-}
+QTVERSION="4.3.3"
+require ${PN}.inc
diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb
deleted file mode 100644
index 2fa53a4d54..0000000000
--- a/packages/qt/qt4-x11-free_4.3.2.bb
+++ /dev/null
@@ -1,187 +0,0 @@
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-LICENSE = "GPL QPL"
-DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \
-           xft libxext libxrender libxrandr libxcursor dbus openssl"
-RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
-PROVIDES = "qt4x11"
-PR = "r6"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0003-no-tools.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0005-fix-mkspecs.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0007-openssl-host-includes.patch;patch=1"
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-PARALLEL_MAKE = ""
-
-inherit qmake_base qt4x11
-
-export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
-EXTRA_OEMAKE = "-e"
-
-require qt4_arch.inc
-
-QT_ARCH := "${@qt_arch(d)}"
-
-# FIXME:
-# * add missing options
-QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \
-                   -no-tablet -no-xkb -no-nis -no-cups -no-opengl \
-                   -no-sse -no-sse2 -no-mmx -no-3dnow \
-                   -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
-                   -qdbus \
-                   -verbose -stl -no-accessibility \
-                   -pch -no-glib"
-
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
-             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
-             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-             AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
-
-do_configure() {
-	echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri
-	echo "DEFINES += QT_NO_XIM" >>src/qbase.pri
-	unset QMAKESPEC
-	ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
-	ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
-	#export QMAKESPEC="linux-oe-g++"
-	#rm -rf ./mkspecs
-	#ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs
-	echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \
-		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
-}
-
-# FIXME: Might want to compile the cross tools for the -dev packages as well...
-do_compile() {
-	unset CFLAGS CXXFLAGS
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
-
-	oe_runmake ${EXTRA_ENV}
-}
-
-PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml"
-
-do_stage() {
-	oe_runmake install INSTALL_ROOT=/
-	install -d ${STAGING_QT_DIR}
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
-	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
-	sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri
-	for pcc in AssistantClient DBus Test UiTools ; do
-		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
-	done
-	install -d ${PKG_CONFIG_DIR}/
-        for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
-		sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc
-                install -m 0644 $pc ${PKG_CONFIG_DIR}/
-        done
-}
-
-# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...
-# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing...
-do_install() {
-	install -d ${D}${libdir}
-	install -d ${D}${bindir}
-	install -d ${D}${includedir}
-	for part in ${PARTS}
-	do
-		oe_libinstall -so -C lib libQt$part ${D}${libdir}
-	done
-	oe_libinstall -a -C lib libQtUiTools ${D}${libdir}
-	cp -pPR include/* ${D}${includedir}
-	cp -pPR plugins ${D}${libdir}
-	cp -pPR bin/* ${D}${bindir}
-
-	install -d ${D}${bindir}/qt4-examples
-	for binary in `find examples -perm 0755 -type f`
-	do
-		install -m 0755 $binary ${D}${bindir}/qt4-examples/
-	done
-	install -d ${D}${bindir}/qt4-demos
-	for binary in `find demos -perm 0755 -type f`
-	do
-		install -m 0755 $binary ${D}${bindir}/qt4-demos/
-	done
-	rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc
-}
-
-NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4  \
-             libqtsql4 libqtsvg4 libqttest4 \
-             libqtxml4 \
-             libqtdesigner4 libqtdesignercomponents4 \
-             libqt3support4 \
-             libqtassistantclient4 libqtscript4 \
-             libqtdbus4 \
-             qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \
-             qt4-pixeltool qt4-dbus \
-             qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \
-             qt4-plugins-inputmethods qt4-plugins-iconengines"
-
-PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \
-             libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \
-             libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \
-	     ${NONDEV_PACKAGES}"
-
-ALLOW_EMPTY = "1"
-FILES_${PN} = ""
-
-FILES_libqtcore4                   = "${libdir}/libQtCore.so.*"
-FILES_libqtcore4-dev               = "${libdir}/libQtCore.so"
-FILES_libqtgui4                    = "${libdir}/libQtGui.so.*"
-FILES_libqtgui4-dev                = "${libdir}/libQtGui.so"
-FILES_libqtnetwork4                = "${libdir}/libQtNetwork.so.*"
-FILES_libqtnetwork4-dev            = "${libdir}/libQtNetwork.so"
-FILES_libqtsql4                    = "${libdir}/libQtSql.so.*"
-FILES_libqtsql4-dev                = "${libdir}/libQtSql.so"
-FILES_libqtsvg4                    = "${libdir}/libQtSvg.so.*"
-FILES_libqtsvg4-dev                = "${libdir}/libQtSvg.so"
-FILES_libqttest4                   = "${libdir}/libQtTest.so.*"
-FILES_libqttest4-dev               = "${libdir}/libQtTest.so"
-FILES_libqtxml4                    = "${libdir}/libQtXml.so.*"
-FILES_libqtxml4-dev                = "${libdir}/libQtXml.so"
-FILES_libqtdesigner4               = "${libdir}/libQtDesigner.so.*"
-FILES_libqtdesigner4-dev           = "${libdir}/libQtDesigner.so"
-FILES_libqtdesignercomponents4     = "${libdir}/libQtDesignerComponents.so.*"
-FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so"
-FILES_libqt3support4               = "${libdir}/libQt3Support.so.*"
-FILES_libqt3support4-dev           = "${libdir}/libQt3Support.so"
-FILES_libqtassistantclient4        = "${libdir}/libQtAssistantClient.so.*"
-FILES_libqtassistantclient4-dev    = "${libdir}/libQtAssistantClient.so"
-FILES_libqtscript4                 = "${libdir}/libQtScript.so.*"
-FILES_libqtscript4-dev             = "${libdir}/libQtScript.so"
-FILES_libqtdbus4                   = "${libdir}/libQtDBus.so.*"
-FILES_libqtdbus4-dev               = "${libdir}/libQtDBus.so"
-
-FILES_qt4-plugins-accessible   = "${libdir}/plugins/accessible/*.so"
-FILES_qt4-plugins-codecs       = "${libdir}/plugins/codecs/*.so"
-FILES_qt4-plugins-designer     = "${libdir}/plugins/designer/*.so"
-FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so"
-FILES_qt4-plugins-sqldrivers   = "${libdir}/plugins/sqldrivers/*.so"
-FILES_qt4-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so"
-FILES_qt4-plugins-iconengines  = "${libdir}/plugins/iconengines/*.so"
-
-FILES_qt4-assistant            = "${bindir}/*assistant*"
-FILES_qt4-designer             = "${bindir}/*designer*"
-FILES_qt4-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
-FILES_qt4-pixeltool            = "${bindir}/pixeltool"
-FILES_qt4-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
-
-FILES_qt4-common               = "${bindir}/qtconfig"
-FILES_qt4-examples             = "${bindir}/qt4-examples/*"
-FILES_qt4-demos                = "${bindir}/qtdemo ${bindir}/qt4-demos/*"
-
-FILES_${PN}-dev               += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \
-                                  ${bindir}/qt3to4 ${bindir}/findtr"
-FILES_${PN}-dbg                += "${bindir}/*/.debug ${plugindir}/.debug"
diff --git a/packages/qt/qt4_arch.inc b/packages/qt/qt4_arch.inc
deleted file mode 100644
index 6dcbd2bc4a..0000000000
--- a/packages/qt/qt4_arch.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-def qt_arch(d):
-	import bb, re
-	arch = bb.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "i386"
-	elif re.match("^arm.*", arch):
-		arch = "arm"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
diff --git a/packages/qt4/.mtn2git_empty b/packages/qt4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/.mtn2git_empty
diff --git a/packages/qt4/files/.mtn2git_empty b/packages/qt4/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/files/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch b/packages/qt4/files/0001-cross-compile.patch
index 6e2b8e755e..6e2b8e755e 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
+++ b/packages/qt4/files/0001-cross-compile.patch
diff --git a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch b/packages/qt4/files/0003-no-tools.patch
index 5412c90377..5412c90377 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
+++ b/packages/qt4/files/0003-no-tools.patch
diff --git a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch
index 93692699dc..faf0ba028a 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
+++ b/packages/qt4/files/0005-fix-mkspecs.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
  mkspecs/common/linux.conf |   26 +++++++++++++-------------
  2 files changed, 22 insertions(+), 22 deletions(-)
 
-diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
-index f5a5c8e..4007c7e 100644
---- a/mkspecs/common/g++.conf
-+++ b/mkspecs/common/g++.conf
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 02:58:21.000000000 +0100
 @@ -2,12 +2,12 @@
  # qmake configuration for common gcc
  #
@@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CFLAGS_WARN_ON	+= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	+= -w
 -QMAKE_CFLAGS_RELEASE	+= -O2
-+QMAKE_CFLAGS_RELEASE	+= -O2 
++QMAKE_CFLAGS_RELEASE	+= 
  QMAKE_CFLAGS_DEBUG	+= -g
  QMAKE_CFLAGS_SHLIB	+= -fPIC
  QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
-@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+@@ -16,8 +16,8 @@
  QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
  
@@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
-@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+@@ -30,9 +30,9 @@
  QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
  
@@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=
-@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
+@@ -40,7 +40,7 @@
  QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
  QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
  QMAKE_LFLAGS_THREAD	+=
@@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644
  
  QMAKE_PCH_OUTPUT_EXT    = .gch
  
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 3796a87..52acf16 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 02:58:21.000000000 +0100
+@@ -7,26 +7,26 @@
  
  QMAKE_INCDIR          =
  QMAKE_LIBDIR          =
@@ -103,7 +103,7 @@ index 3796a87..52acf16 100644
  QMAKE_RANLIB          =
  
  QMAKE_TAR             = tar -cf
-@@ -38,11 +38,11 @@ QMAKE_COPY_DIR        = $(COPY) -r
+@@ -38,11 +38,11 @@
  QMAKE_MOVE            = mv -f
  QMAKE_DEL_FILE        = rm -f
  QMAKE_DEL_DIR         = rmdir
@@ -118,6 +118,16 @@ index 3796a87..52acf16 100644
 -include(unix.conf)
 \ No newline at end of file
 +include(unix.conf)
--- 
-1.5.0.7
-
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 03:00:49.000000000 +0100
+@@ -5,7 +5,7 @@
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+ CONFIG			+= qt warn_on release incremental link_prl
+-QT			+= core gui
++QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+ include(../common/g++.conf)
diff --git a/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
index ab943db1ff..ab943db1ff 100644
--- a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch
index 7c8665c9c1..7c8665c9c1 100644
--- a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch
index 93fc52d055..93fc52d055 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch
index e927df9c7d..e927df9c7d 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
index fcd5de6f97..fcd5de6f97 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch
index 392aaf4f5f..392aaf4f5f 100644
--- a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch
index 324f44303a..324f44303a 100644
--- a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch
index 2bda49c9c5..2bda49c9c5 100644
--- a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch
diff --git a/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch
index e479a64a2b..e479a64a2b 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch
index 359f6df9d5..359f6df9d5 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch
index cc8e115fee..cc8e115fee 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch
diff --git a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch
index 35b71d9694..35b71d9694 100644
--- a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch
diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
new file mode 100644
index 0000000000..75f7344e24
--- /dev/null
+++ b/packages/qt4/qt4-x11-free.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL QPL"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+PROVIDES = "qt4x11"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0005-fix-mkspecs.patch;patch=1"
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
+QT_BASE_NAME = "qt4"
+QT_BASE_LIB  = "libqt"
+QT_LIBRARY_NAME = "Qt"
+QT_DIR_NAME = "qt4"
+require qt_depends.inc
+require qt_configuration.inc
+require qt_packaging.inc
+require qt_staging.inc
+
+inherit qt4x11
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb
index 77fa6dba12..77fa6dba12 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt4/qt4-x11-free_4.1.2.bb
diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb
new file mode 100644
index 0000000000..7d30503c07
--- /dev/null
+++ b/packages/qt4/qt4-x11-free_4.3.3.bb
@@ -0,0 +1,5 @@
+require qt4-x11-free.inc
+SRC_URI += " \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 "
diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc
new file mode 100644
index 0000000000..60ede1db2b
--- /dev/null
+++ b/packages/qt4/qt4_arch.inc
@@ -0,0 +1,23 @@
+inherit siteinfo
+
+def qt_arch(d):
+    import bb, re
+    arch = bb.data.getVar('TARGET_ARCH', d, 1)
+    if re.match("^i.86$", arch):
+        arch = "i386"
+    elif re.match("^arm.*", arch):
+        arch = "arm"
+    elif arch == "x86_64":
+        arch = "x86"
+    elif arch == "mipsel":
+        arch = "mips"
+    return arch
+
+def qt_endian(d):
+    import bb
+    if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
+        return "-little-endian"
+    elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
+        return "-big-endian"
+    else:
+        assert False
diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc
new file mode 100644
index 0000000000..aa4f8c6c5e
--- /dev/null
+++ b/packages/qt4/qt_configuration.inc
@@ -0,0 +1,82 @@
+require qt4_arch.inc
+QT_ARCH := "${@qt_arch(d)}"
+QT_ENDIAN = "${@qt_endian(d)}"
+
+QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \
+                   -shared -no-nas-sound -no-sm -no-nis \
+                   -qt-gif -system-libjpeg -system-libpng -system-zlib \
+                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+                   -no-pch -qdbus -stl -glib"
+
+EXTRA_OEMAKE = "-e"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
+             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+             AR="${TARGET_PREFIX}ar cqs" \
+             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+
+export QT_CONF_PATH="${WORKDIR}/qt.conf"
+
+do_configure() {
+    unset QMAKESPEC
+    unset QTDIR
+    ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+    ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
+
+    echo "[Paths]"                                 > $QT_CONF_PATH
+    echo "Prefix=${prefix}"                       >> $QT_CONF_PATH
+    echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+    echo "Headers=${includedir}/${QT_DIR_NAME}"   >> $QT_CONF_PATH
+    echo "Libraries=${libdir}"                    >> $QT_CONF_PATH
+    echo "Binaries=${bindir}"                     >> $QT_CONF_PATH
+    echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
+    echo "Data=${datadir}/${QT_DIR_NAME}"         >> $QT_CONF_PATH
+    echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
+    echo "Settings=${sysconfdir}/${QT_DIR_NAME}"  >> $QT_CONF_PATH
+    echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
+    echo "Demos=${bindir}/${QT_DIR_NAME}/demos"   >> $QT_CONF_PATH
+
+    echo yes | ./configure -v \
+            -prefix ${prefix} \
+            -bindir ${bindir} \
+            -libdir ${libdir} \
+            -datadir ${datadir}/${QT_DIR_NAME} \
+            -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
+            -docdir ${docdir}/${QT_DIR_NAME} \
+            -headerdir ${includedir}/${QT_DIR_NAME} \
+            -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
+            -translationdir ${datadir}/${QT_DIR_NAME}/translations \
+            -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
+            -demosdir ${bindir}/${QT_DIR_NAME}/demos \
+            -platform ${TARGET_OS}-oe-g++ \
+            -xplatform ${TARGET_OS}-oe-g++ \
+            -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
+            -crossarch ${QT_ARCH} \
+            ${QT_CONFIG_FLAGS} -fast \
+            -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
+            -I${STAGING_INCDIR}/freetype2
+}
+
+do_compile() {
+    unset CFLAGS CXXFLAGS
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+    install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+
+    oe_runmake ${EXTRA_ENV}
+}
+
+#
+# Fixup some pkgconfig files
+# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc
+# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic
+#
+# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib  $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl
+#
+do_compile_append() {
+    cd ${S}/lib/pkgconfig
+    sed -i s#"-L${S}/lib"##g *.pc
+    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc
+    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc
+}
diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc
new file mode 100644
index 0000000000..289b625d0e
--- /dev/null
+++ b/packages/qt4/qt_depends.inc
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0"
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
new file mode 100644
index 0000000000..472faa3da4
--- /dev/null
+++ b/packages/qt4/qt_packaging.inc
@@ -0,0 +1,153 @@
+NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4  \
+             ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \
+             ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
+             ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
+             ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \
+             ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
+             ${QT_BASE_NAME}-designer \
+             ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
+             ${QT_BASE_NAME}-linguist \
+             ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \
+             ${QT_BASE_NAME}-plugins-accessible \
+             ${QT_BASE_NAME}-plugins-codecs \
+             ${QT_BASE_NAME}-plugins-designer \
+             ${QT_BASE_NAME}-plugins-imageformats \
+             ${QT_BASE_NAME}-plugins-sqldrivers \
+             ${QT_BASE_NAME}-plugins-inputmethods \
+             ${QT_BASE_NAME}-plugins-iconengines \
+             ${QT_BASE_NAME}-fonts "
+
+DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
+             ${QT_BASE_LIB}gui4-dev \
+             ${QT_BASE_LIB}network4-dev \
+             ${QT_BASE_LIB}sql4-dev \
+             ${QT_BASE_LIB}svg4-dev \
+             ${QT_BASE_LIB}test4-dev \
+             ${QT_BASE_LIB}xml4-dev \
+             ${QT_BASE_LIB}designer4-dev \
+             ${QT_BASE_LIB}designercomponents4-dev \
+             ${QT_BASE_LIB}3support4-dev \
+             ${QT_BASE_LIB}assistantclient4-dev \
+             ${QT_BASE_LIB}script4-dev \
+             ${QT_BASE_LIB}dbus4-dev \
+             ${QT_BASE_LIB}opengl4-dev \
+             ${QT_BASE_LIB}uitools4-dev"
+
+DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
+             ${QT_BASE_LIB}gui4-dbg \
+             ${QT_BASE_LIB}network4-dbg \
+             ${QT_BASE_LIB}sql4-dbg \
+             ${QT_BASE_LIB}svg4-dbg \
+             ${QT_BASE_LIB}test4-dbg \
+             ${QT_BASE_LIB}xml4-dbg \
+             ${QT_BASE_LIB}designer4-dbg \
+             ${QT_BASE_LIB}designercomponents4-dbg \
+             ${QT_BASE_LIB}3support4-dbg \
+             ${QT_BASE_LIB}assistantclient4-dbg \
+             ${QT_BASE_LIB}script4-dbg \
+             ${QT_BASE_LIB}dbus4-dbg \
+             ${QT_BASE_LIB}opengl4-dbg "
+
+
+PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}     = ""
+FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
+FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so"
+RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
+RDEPENDS_${PN}-dev = "${DEV_PACKAGES}"
+RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
+
+def qt_default_dev(name):
+    return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la 
+              ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl
+              ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so
+              ${includedir}/${QT_DIR_NAME}/Qt%(name)s*
+              ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals()
+
+
+FILES_${QT_BASE_LIB}core4                   = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*"
+FILES_${QT_BASE_LIB}core4-dev               = "${@qt_default_dev('Core')}"
+FILES_${QT_BASE_LIB}core4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*"
+FILES_${QT_BASE_LIB}gui4                    = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*"
+FILES_${QT_BASE_LIB}gui4-dev                = "${@qt_default_dev('Gui')}"
+FILES_${QT_BASE_LIB}gui4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*"
+FILES_${QT_BASE_LIB}network4                = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*"
+FILES_${QT_BASE_LIB}network4-dev            = "${@qt_default_dev('Network')}"
+FILES_${QT_BASE_LIB}network4-dbg            = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*"
+FILES_${QT_BASE_LIB}sql4                    = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*"
+FILES_${QT_BASE_LIB}sql4-dev                = "${@qt_default_dev('Sql')}"
+FILES_${QT_BASE_LIB}sql4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*"
+FILES_${QT_BASE_LIB}svg4                    = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*"
+FILES_${QT_BASE_LIB}svg4-dev                = "${@qt_default_dev('Svg')}"
+FILES_${QT_BASE_LIB}svg4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*"
+FILES_${QT_BASE_LIB}test4                   = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*"
+FILES_${QT_BASE_LIB}test4-dev               = "${@qt_default_dev('Test')}"
+FILES_${QT_BASE_LIB}test4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*"
+FILES_${QT_BASE_LIB}xml4                    = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*"
+FILES_${QT_BASE_LIB}xml4-dev                = "${@qt_default_dev('Xml')}"
+FILES_${QT_BASE_LIB}xml4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*"
+FILES_${QT_BASE_LIB}designer4               = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*"
+FILES_${QT_BASE_LIB}designer4-dev           = "${@qt_default_dev('Designer')}"
+FILES_${QT_BASE_LIB}designer4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*"
+FILES_${QT_BASE_LIB}designercomponents4     = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*"
+FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}"
+FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*"
+FILES_${QT_BASE_LIB}3support4               = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*"
+FILES_${QT_BASE_LIB}3support4-dev           = "${@qt_default_dev('3Support')}"
+FILES_${QT_BASE_LIB}3support4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*"
+FILES_${QT_BASE_LIB}assistantclient4        = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*"
+FILES_${QT_BASE_LIB}assistantclient4-dev    = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*"
+FILES_${QT_BASE_LIB}assistantclient4-dbg    = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*"
+FILES_${QT_BASE_LIB}script4                 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*"
+FILES_${QT_BASE_LIB}script4-dev             = "${@qt_default_dev('Script')}"
+FILES_${QT_BASE_LIB}script4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*"
+FILES_${QT_BASE_LIB}dbus4                   = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*"
+FILES_${QT_BASE_LIB}dbus4-dev               = "${@qt_default_dev('DBus')}"
+FILES_${QT_BASE_LIB}dbus4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*"
+FILES_${QT_BASE_LIB}opengl4                 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*"
+FILES_${QT_BASE_LIB}opengl4-dev             = "${@qt_default_dev('OpenGL')}"
+FILES_${QT_BASE_LIB}opengl4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*"
+FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"
+
+
+FILES_${QT_BASE_NAME}-plugins-accessible   = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so"
+FILES_${QT_BASE_NAME}-plugins-codecs       = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so"
+FILES_${QT_BASE_NAME}-plugins-designer     = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
+FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so"
+FILES_${QT_BASE_NAME}-plugins-sqldrivers   = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so"
+FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so"
+FILES_${QT_BASE_NAME}-plugins-iconengines  = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so"
+
+FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant*"
+FILES_${QT_BASE_NAME}-designer             = "${bindir}/*designer*"
+FILES_${QT_BASE_NAME}-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
+FILES_${QT_BASE_NAME}-pixeltool            = "${bindir}/pixeltool"
+FILES_${QT_BASE_NAME}-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
+
+FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
+FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_DIR_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
+
+FILES_${QT_BASE_NAME}-fonts                = "${libdir}/fonts"
+
+python populate_packages_prepend() {
+	translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
+	do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' )
+}
+
+
+do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+
+    # These are host binaries, we should only use them in staging
+    rm -rf ${D}/${bindir}/qmake
+
+    # XXX, FIXME, TODO: package the demos and examples properly
+    rm -rf ${D}/${bindir}/${QT_DIR_NAME}
+    rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
+
+    install -d ${D}/${libdir}/fonts
+    touch ${D}/${libdir}/fonts/fontdir
+}
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
new file mode 100644
index 0000000000..21f17590b5
--- /dev/null
+++ b/packages/qt4/qt_staging.inc
@@ -0,0 +1,25 @@
+# Fixing up some Qt .pc files
+do_stage_append() {
+    cd ${STAGING_LIBDIR}/pkgconfig
+    sed -i s#"-L${S}/lib"##g Qt*.pc
+    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
+    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
+}
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+do_stage() {
+    rm -rf ${STAGE_TEMP}
+    mkdir -p ${STAGE_TEMP}
+    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
+
+    install -d ${STAGING_INCDIR}/
+    install -d ${STAGING_LIBDIR}/${QT_DIR_NAME}
+    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/
+
+    for i in ${STAGE_TEMP}/${libdir}/*.la
+    do
+        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME}
+    done
+
+    rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty b/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty
diff --git a/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
new file mode 100644
index 0000000000..cc8e115fee
--- /dev/null
+++ b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
@@ -0,0 +1,23 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 84974bf..ab9a6f2 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         p = $$join(p, "", "", "/freetype2")
+         exists($$p):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
new file mode 100644
index 0000000000..35b71d9694
--- /dev/null
+++ b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
@@ -0,0 +1,23 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
+index 756e5fe..19b4061 100644
+--- a/config.tests/unix/openssl/openssl.pri
++++ b/config.tests/unix/openssl/openssl.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         pp = $$join(p, "", "", "/openssl")
+         exists($$pp):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc
new file mode 100644
index 0000000000..06837787cf
--- /dev/null
+++ b/packages/qt4/qtopia-core.inc
@@ -0,0 +1,29 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the QtopiaCore/Embedded version."
+SECTION = "libs"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "tslib"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0003-no-tools.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0005-fix-mkspecs.patch;patch=1"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += " \
+    -nomake demos -nomake examples -nomake tools \
+    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
+QT_BASE_NAME = "qtopiacore"
+QT_BASE_LIB  = "libqtopiacore"
+QT_LIBRARY_NAME = "Qt"
+QT_DIR_NAME = "qtopia"
+require qt_depends.inc
+require qt_configuration.inc
+require qt_packaging.inc
+require qt_staging.inc
+
+inherit qtopia4core
diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qtopia-core/.mtn2git_empty
diff --git a/packages/qt4/qtopia-core/0004-no-qmake.patch b/packages/qt4/qtopia-core/0004-no-qmake.patch
new file mode 100644
index 0000000000..28f8d3ad9d
--- /dev/null
+++ b/packages/qt4/qtopia-core/0004-no-qmake.patch
@@ -0,0 +1,25 @@
+From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:06:59 +0200
+Subject: [PATCH] no qmake
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index b3c2a52..1901e57 100755
+--- a/configure
++++ b/configure
+@@ -3517,7 +3517,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.5.0.7
+
diff --git a/packages/qte/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf
index fc5ac6dc5c..fc5ac6dc5c 100644
--- a/packages/qte/qtopia-core/linux-oe-qmake.conf
+++ b/packages/qt4/qtopia-core/linux-oe-qmake.conf
diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/packages/qt4/qtopia-core_4.2.0.bb
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb
new file mode 100644
index 0000000000..b903e2b06a
--- /dev/null
+++ b/packages/qt4/qtopia-core_4.3.3.bb
@@ -0,0 +1,4 @@
+require qtopia-core.inc
+SRC_URI += " \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 "
diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qte/qtopia-core_4.2.0.bb
deleted file mode 100644
index ab07ecf35d..0000000000
--- a/packages/qte/qtopia-core_4.2.0.bb
+++ /dev/null
@@ -1,218 +0,0 @@
-DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)"
-SECTION = "libs"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 freetype dbus-glib tslib"
-
-PR = "r2"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
-           file://linux-oe-qmake.conf"
-
-S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-
-inherit pkgconfig
-
-# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even
-# needed. On the same issue, I'm not sure what the best place for all the
-# Qtopia Core related files is. For now, I've just put the libraries in
-# ${libdir}, the includes in ${includedir} etc. Other possibilities are
-# to sandbox everything (e.g., in /usr/local/Trolltech or /opt/Qtopia oslt),
-# or to put libraries in /usr/lib/qtopia (or /usr/lib/qt4) etc. As said,
-# I'm fine with this, but I'm also fine with another solution.
-
-# set QTDIR and QTOPIADIR globally (change QTOPIA dir to QTDIR?)
-# This should be the default for other packages:
-# export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
-# export QTOPIADIR = "${STAGING_DIR}/${HOST_SYS}/qtopia"
-export QTDIR = "${S}"
-export QTOPIADIR = "${S}"
-
-# Qmake gets confused by environment variables, as it builds both HOST
-# and TARGET objects. The correct compiler settings come from the mkspec
-# and are set with the OE_QMAKE_ variables
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = " MAKEFLAGS= "
-
-# This stuff could also be done by inheriting qmake, but I didn't want to
-# bother with the qmake separation from the Qtopia configure. This separation
-# is probably nothing more than a patch on the configure and setting some
-# environment variables to use our own qmake/moc/uic, but that's something
-# to figure out later.
-export OE_QMAKE_CC="${CC}"
-export OE_QMAKE_CFLAGS="${CFLAGS}"
-export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}"
-export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-export OE_QMAKE_LINK="${CXX}"
-export OE_QMAKE_AR="${AR}"
-export OE_QMAKE_RANLIB="${RANLIB}"
-export OE_QMAKE_STRIP="echo"
-export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
-export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
-
-require qte-functions.inc
-QT_ARCH := "${@qte_arch(d)}"
-
-# FIXME use info.bbclass once it has been commited
-QT_ENDIAN = "-little-endian"
-
-# We don't build the examples and demos atm. They're quite big and not used
-# frequently, only for testing maybe. Feel free to change and to package
-# them separately.
-QT_CONFIG_FLAGS = "-release \
-	-no-cups -no-accessibility \
-	-nomake demos -nomake examples -nomake tools \
-	-qt-mouse-tslib"
-
-do_configure() {
-	# Install the OE build templates (something which might be done
-	# by inheriting qmake)
-	for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-	do
-		install -d ${S}/mkspecs/$template
-		install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \
-			${S}/mkspecs/$template/qmake.conf
-		ln -sf ../linux-g++/qplatformdefs.h \
-			${S}/mkspecs/$template/qplatformdefs.h
-	done
-
-	# The Qmake Makefile generation doesn't like these environment
-	# variables, as they mess up the HOST tools builds
-	unset CC
-	unset CXX
-	unset CFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-
-	# For rationale behind the installation locations, see remark above
-	echo yes | ./configure -v \
-		-prefix ${prefix} \
-		-bindir ${bindir} \
-		-libdir ${libdir} \
-		-docdir ${docdir}/qtopia \
-		-headerdir ${includedir} \
-		-plugindir ${datadir}/qtopia/plugins \
-		-datadir ${datadir} \
-		-translationdir ${datadir}/qtopia/translations \
-		-sysconfdir ${sysconfdir} \
-		-examplesdir ${bindir}/qtopia/examples \
-		-demosdir ${bindir}/qtopia/demos \
-		-embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
-		-xplatform linux-oe-g++ \
-		${QT_CONFIG_FLAGS} \
-		-L${STAGING_LIBDIR} -I${STAGING_INCDIR}
-}
-
-do_install() {
-	oe_runmake install INSTALL_ROOT=${D}
-
-	# These are host binaries, we should only use them in staging
-	rm -rf ${D}/${bindir}
-	rm -rf ${D}/${datadir}/mkspecs
-        
-	touch ${D}/${libdir}/fonts/fontdir
-
-        #TT is still new to pkgconfig, so fix it up 
-        install -d ${D}${libdir}/pkgconfig
-        mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/
-}
-
-# We might want to package all the libraries separately, so you can really
-# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
-# What should these packages be called? I'm tempted to call them the same
-# as in qt4 version, as the API is supposed to be compatible, e.g.
-# libqtcore4 and libqtgui4. This will however conflict if you have QT and
-# Qtopia, but this is something you don't want anyway, I guess.
-# Another solution is making virtual/libqtfoo4, and DEPENDing on that one
-# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages
-# themselves could then be called libqtopiafoo4.
-# I'll postpone this discussion by not making separate Qtopia packages.
-
-# Also, I don't package the plugins and translations atm, I don't use them
-# and I don't feel like thinking about a sensible separation.
-
-PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \
-              libqtxml libqtxml-dev libqtxml-dbg \
-              libqtgui libqtgui-dev libqtgui-dbg \
-              libqtsql libqtsql-dev libqtsql-dbg \
-              libqtnetwork libqtnetwork-dev libqtnetwork-dbg \
-              libqtsvg libqtsvg-dev libqtsvg-dbg \
-              libqt3support libqt3support-dev libqt3support-dbg \
-              qtopia-core-plugins qtopia-core-plugins-dbg\
-              "
-
-PACKAGES += " ${PN}-fonts "
-
-# The default included fonts are around 75MB and consist of a number of
-# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts).
-# As FreeType is generally slow on embedded platforms, and 75MB is
-# quite huge, we downsize the fonts dir in the do_install. I've decided
-# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This
-# also results in tremendously faster application startup time.
-FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir"
-FILES_${PN}-fonts = "${libdir}/fonts"
-
-FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so"
-FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so"
-
-FILES_libqtcore += "${libdir}/libQtCore.so.*"
-FILES_libqtxml += "${libdir}/libQtXml.so.*"
-FILES_libqtgui += "${libdir}/libQtGui.so.*"
-FILES_libqtsql += "${libdir}/libQtSql.so.*"
-FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*"
-FILES_libqtsvg += "${libdir}/libQtSvg.so.*"
-FILES_libqt3support += "${libdir}/libQt3Support.so.*"
-
-FILES_libqtcore-dev += "${libdir}/*QtCore.*"
-FILES_libqtxml-dev += "${libdir}/*QtXml.*"
-FILES_libqtgui-dev += "${libdir}/*QtGui.*"
-FILES_libqtsql-dev += "${libdir}/*QtSql.*"
-FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*"
-FILES_libqtsvg-dev += "${libdir}/*QtSvg.*"
-FILES_libqt3support-dev += "${libdir}/*Qt3Support.*"
-
-FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*"
-FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*"
-FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*"
-FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*"
-FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*"
-FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*"
-FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*"
-
-
-python populate_packages_prepend() {
-        translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
-        do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
-}
-
-
-
-STAGE_TEMP = "${WORKDIR}/temp-staging"
-do_stage() {
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
-
-	cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}
-
-	for i in ${STAGE_TEMP}/${libdir}/*.la
-	do
-		oe_libinstall -C ${STAGE_TEMP}/${libdir} \
-			-so $(basename $i .la) ${STAGING_LIBDIR}
-	done
-
-	# Install qmake/moc/uic/rcc in staging (is this needed?)
-	install -m 0755 ${STAGE_TEMP}/${bindir}/rcc ${STAGING_BINDIR}
-	install -m 0755 ${STAGE_TEMP}/${bindir}/moc ${STAGING_BINDIR}
-	install -m 0755 ${STAGE_TEMP}/${bindir}/uic ${STAGING_BINDIR}
-	install -m 0755 ${STAGE_TEMP}/${bindir}/qmake ${STAGING_BINDIR}
-	# what about mkspecs?
-
-	rm -rf ${STAGE_TEMP}
-}
-
diff --git a/packages/qte/qtopia-core_4.3.2.bb b/packages/qte/qtopia-core_4.3.2.bb
deleted file mode 100644
index c486ba164f..0000000000
--- a/packages/qte/qtopia-core_4.3.2.bb
+++ /dev/null
@@ -1,222 +0,0 @@
-SUMMARY = "QtopiaCore"
-SECTION = "libs"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "freetype tslib"
-
-PR = "r0"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
-           file://linux-oe-qmake.conf"
-
-S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-
-inherit pkgconfig
-
-# Qmake gets confused by environment variables, as it builds both HOST
-# and TARGET objects. The correct compiler settings come from the mkspec
-# and are set with the OE_QMAKE_ variables
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = " MAKEFLAGS= "
-
-# This stuff could also be done by inheriting qmake, but I didn't want to
-# bother with the qmake separation from the Qtopia configure. This separation
-# is probably nothing more than a patch on the configure and setting some
-# environment variables to use our own qmake/moc/uic, but that's something
-# to figure out later.
-export OE_QMAKE_CC="${CC}"
-export OE_QMAKE_CFLAGS="${CFLAGS}"
-export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}"
-export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-export OE_QMAKE_LINK="${CXX}"
-export OE_QMAKE_AR="${AR}"
-export OE_QMAKE_RANLIB="${RANLIB}"
-export OE_QMAKE_STRIP="echo"
-export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include"
-export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib"
-
-require qte-functions.inc
-QT_ARCH := "${@qte_arch(d)}"
-
-# FIXME use info.bbclass once it has been commited
-QT_ENDIAN = "-little-endian"
-
-# We don't build the examples and demos atm. They're quite big and not used
-# frequently, only for testing maybe. Feel free to change and to package
-# them separately.
-QT_CONFIG_FLAGS = "-release \
-    -no-cups -no-accessibility \
-    -nomake demos -nomake examples -nomake tools -reduce-relocations \
-    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
-
-do_configure() {
-    # Hack to honor our compiler flags
-    sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf
-    sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf
-
-
-    # Install the OE build templates (something which might be done
-    # by inheriting qmake)
-    for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-    do
-        install -d ${S}/mkspecs/$template
-        install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-        ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-    done
-
-    # The Qmake Makefile generation doesn't like these environment
-    # variables, as they mess up the HOST tools builds
-    unset CC
-    unset CXX
-    unset CFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
-
-    # For rationale behind the installation locations, see remark above
-    echo yes | ./configure -v \
-        -prefix ${prefix} \
-        -bindir ${bindir} \
-        -libdir ${libdir} \
-        -docdir ${docdir}/qtopia \
-        -headerdir ${includedir} \
-        -plugindir ${datadir}/qtopia/plugins \
-        -datadir ${datadir} \
-        -translationdir ${datadir}/qtopia/translations \
-        -sysconfdir ${sysconfdir} \
-        -examplesdir ${bindir}/qtopia/examples \
-        -demosdir ${bindir}/qtopia/demos \
-        -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
-        -xplatform linux-oe-g++ \
-        ${QT_CONFIG_FLAGS} \
-        -L${STAGING_LIBDIR} -I${STAGING_INCDIR}
-}
-
-#
-# Fixup some pkgconfig files
-# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc
-# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic
-#
-# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib  $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl
-#
-do_compile_append() {
-    cd ${S}/lib/pkgconfig
-    sed -i s#"-L${S}/lib"##g *.pc
-    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc
-    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc
-}
-
-do_stage_append() {
-    echo "Fixing up Qt"
-    cd ${STAGING_LIBDIR}/pkgconfig
-    sed -i s#"-L${S}/lib"##g Qt*.pc
-    sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
-    sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-
-    # These are host binaries, we should only use them in staging
-    rm -rf ${D}/${bindir}
-    rm -rf ${D}/${datadir}/mkspecs
-        
-    touch ${D}/${libdir}/fonts/fontdir
-}
-
-# We might want to package all the libraries separately, so you can really
-# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
-# What should these packages be called? I'm tempted to call them the same
-# as in qt4 version, as the API is supposed to be compatible, e.g.
-# libqtcore4 and libqtgui4. This will however conflict if you have QT and
-# Qtopia, but this is something you don't want anyway, I guess.
-# Another solution is making virtual/libqtfoo4, and DEPENDing on that one
-# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages
-# themselves could then be called libqtopiafoo4.
-# I'll postpone this discussion by not making separate Qtopia packages.
-
-# Also, I don't package the plugins and translations atm, I don't use them
-# and I don't feel like thinking about a sensible separation.
-
-PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \
-              libqtxml libqtxml-dev libqtxml-dbg \
-              libqtgui libqtgui-dev libqtgui-dbg \
-              libqtsql libqtsql-dev libqtsql-dbg \
-              libqtnetwork libqtnetwork-dev libqtnetwork-dbg \
-              libqtsvg libqtsvg-dev libqtsvg-dbg \
-              libqt3support libqt3support-dev libqt3support-dbg \
-              qtopia-core-plugins qtopia-core-plugins-dbg \
-              libqtscript libqtscript-dev libqtscript-dbg \
-              "
-
-PACKAGES += " ${PN}-fonts "
-
-# The default included fonts are around 75MB and consist of a number of
-# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts).
-# As FreeType is generally slow on embedded platforms, and 75MB is
-# quite huge, we downsize the fonts dir in the do_install. I've decided
-# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This
-# also results in tremendously faster application startup time.
-FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir"
-FILES_${PN}-fonts = "${libdir}/fonts"
-
-FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so"
-FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so"
-
-FILES_libqtcore += "${libdir}/libQtCore.so.*"
-FILES_libqtxml += "${libdir}/libQtXml.so.*"
-FILES_libqtgui += "${libdir}/libQtGui.so.*"
-FILES_libqtsql += "${libdir}/libQtSql.so.*"
-FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*"
-FILES_libqtsvg += "${libdir}/libQtSvg.so.*"
-FILES_libqt3support += "${libdir}/libQt3Support.so.*"
-FILES_libqtscript += "${libdir}/libQtScript.so.*"
-
-FILES_libqtcore-dev += "${libdir}/*QtCore.*"
-FILES_libqtxml-dev += "${libdir}/*QtXml.*"
-FILES_libqtgui-dev += "${libdir}/*QtGui.*"
-FILES_libqtsql-dev += "${libdir}/*QtSql.*"
-FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*"
-FILES_libqtsvg-dev += "${libdir}/*QtSvg.*"
-FILES_libqt3support-dev += "${libdir}/*Qt3Support.*"
-FILES_libqtscript-dev += "${libdir}/*QtScript.*"
-
-FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*"
-FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*"
-FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*"
-FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*"
-FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*"
-FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*"
-FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*"
-FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*"
-
-
-python populate_packages_prepend() {
-	translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
-	do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
-}
-
-
-
-STAGE_TEMP = "${WORKDIR}/temp-staging"
-do_stage() {
-    rm -rf ${STAGE_TEMP}
-    mkdir -p ${STAGE_TEMP}
-    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
-
-    install -d ${STAGING_INCDIR}/qtopiacore4
-    install -d ${STAGING_LIBDIR}/qtopiacore4
-    cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
-
-    for i in ${STAGE_TEMP}/${libdir}/*.la
-    do
-        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
-    done
-
-    rm -rf ${STAGE_TEMP}
-}
-
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
index bfecfc8822..f46a3306fe 100644
--- a/packages/tasks/task-nas-server.bb
+++ b/packages/tasks/task-nas-server.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for a Network Attached Storage server"
 LICENSE = "MIT"
 PROVIDES = "task-nas-server-everything"
-PR = "r0"
+PR = "r1"
 
 inherit task
 
@@ -15,6 +15,7 @@ NAS_SERVER_PACKAGES = "\
 	task-nas-server-samba \
 	task-nas-server-dnsmasq \
 	task-nas-server-iptables \
+	task-nas-server-openmoko \
 	task-nas-server-tzdata \
 	task-nas-server-nfs \
 	task-nas-server-vfat \
@@ -55,6 +56,13 @@ RRECOMMENDS_task-nas-server-iptables = "\
 	kernel-module-ipt-masquerade \
 "
 
+DESCRIPTION_task-nas-server-openmoko = "NAS-Server: OpenMoko Support"
+RDEPENDS_task-nas-server-openmoko = "\
+	dfu-util \
+"
+RRECOMMENDS_task-nas-server-openmoko = "\
+"
+
 DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
 RDEPENDS_task-nas-server-tzdata = "\
 	tzdata \
diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc
index 8f0c715a89..298c103fb1 100644
--- a/packages/uicmoc/uicmoc4-native.inc
+++ b/packages/uicmoc/uicmoc4-native.inc
@@ -27,8 +27,8 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
 EXTRA_OEMAKE = " "
 
 do_configure() {
-	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+    sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+    echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
 TOBUILD = "\
@@ -45,17 +45,18 @@ TOBUILD = "\
 "
 
 do_compile() {
-	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	for i in ${TOBUILD}; do
-		cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
-	done
+    unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+    for i in ${TOBUILD};
+    do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
 }
 
 do_stage() {
-        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
-        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
-        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
-        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
-        install -d ${STAGING_DIR_NATIVE}/qt4/
-        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
+    install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+    install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+    install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+    install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+    install -d ${STAGING_DIR_NATIVE}/qt4/
+    install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
 }
diff --git a/packages/uicmoc/uicmoc4-native_4.3.2.bb b/packages/uicmoc/uicmoc4-native_4.3.3.bb
index 1950f63068..1950f63068 100644
--- a/packages/uicmoc/uicmoc4-native_4.3.2.bb
+++ b/packages/uicmoc/uicmoc4-native_4.3.3.bb
diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch
new file mode 100644
index 0000000000..e019f3a117
--- /dev/null
+++ b/packages/zaurusd/files/alsa-6000x-default.state.patch
@@ -0,0 +1,750 @@
+--- zaurusd/config/alsa/6000x-default.state.old	2007-12-22 04:31:38.000000000 -0600
++++ zaurusd/config/alsa/6000x-default.state	2007-12-26 00:06:02.000000000 -0600
+@@ -37,13 +37,23 @@ state.Tosa {
+ 	}
+ 	control.5 {
+ 		comment.access 'read write'
++		comment.type INTEGER
++		comment.count 2
++		comment.range '0 - 31'
++		iface MIXER
++		name 'PCM Playback Volume'
++		value.0 23
++		value.1 23
++	}
++	control.6 {
++		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'Speaker Playback ZC Switch'
+ 		value true
+ 	}
+-	control.6 {
++	control.7 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -51,7 +61,7 @@ state.Tosa {
+ 		name 'Speaker Playback Invert Switch'
+ 		value true
+ 	}
+-	control.7 {
++	control.8 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -59,7 +69,7 @@ state.Tosa {
+ 		name 'Headphone Playback ZC Switch'
+ 		value true
+ 	}
+-	control.8 {
++	control.9 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -67,7 +77,7 @@ state.Tosa {
+ 		name 'Mono Playback ZC Switch'
+ 		value false
+ 	}
+-	control.9 {
++	control.10 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -76,7 +86,7 @@ state.Tosa {
+ 		name 'Mono Playback Volume'
+ 		value 0
+ 	}
+-	control.10 {
++	control.11 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -85,16 +95,16 @@ state.Tosa {
+ 		name 'ALC Target Volume'
+ 		value 11
+ 	}
+-	control.11 {
++	control.12 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Hold Time'
+-		value 0
++		value 2
+ 	}
+-	control.12 {
++	control.13 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -103,7 +113,7 @@ state.Tosa {
+ 		name 'ALC Decay Time'
+ 		value 3
+ 	}
+-	control.13 {
++	control.14 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -112,7 +122,7 @@ state.Tosa {
+ 		name 'ALC Attack Time'
+ 		value 2
+ 	}
+-	control.14 {
++	control.15 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -124,7 +134,7 @@ state.Tosa {
+ 		name 'ALC Function'
+ 		value None
+ 	}
+-	control.15 {
++	control.16 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -133,7 +143,7 @@ state.Tosa {
+ 		name 'ALC Max Volume'
+ 		value 7
+ 	}
+-	control.16 {
++	control.17 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -142,7 +152,7 @@ state.Tosa {
+ 		name 'ALC ZC Timeout'
+ 		value 0
+ 	}
+-	control.17 {
++	control.18 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -150,7 +160,7 @@ state.Tosa {
+ 		name 'ALC ZC Switch'
+ 		value false
+ 	}
+-	control.18 {
++	control.19 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -158,7 +168,7 @@ state.Tosa {
+ 		name 'ALC NG Switch'
+ 		value false
+ 	}
+-	control.19 {
++	control.20 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -168,7 +178,7 @@ state.Tosa {
+ 		name 'ALC NG Type'
+ 		value 'Constant Gain'
+ 	}
+-	control.20 {
++	control.21 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -177,16 +187,16 @@ state.Tosa {
+ 		name 'ALC NG Threshold'
+ 		value 31
+ 	}
+-	control.21 {
++	control.22 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Mic Headphone  Volume'
+-		value 3
++		value 7
+ 	}
+-	control.22 {
++	control.23 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -195,7 +205,7 @@ state.Tosa {
+ 		name 'ALC Headphone Volume'
+ 		value 5
+ 	}
+-	control.23 {
++	control.24 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -203,7 +213,7 @@ state.Tosa {
+ 		name 'Out3 Switch'
+ 		value false
+ 	}
+-	control.24 {
++	control.25 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -211,7 +221,7 @@ state.Tosa {
+ 		name 'Out3 ZC Switch'
+ 		value true
+ 	}
+-	control.25 {
++	control.26 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -220,7 +230,7 @@ state.Tosa {
+ 		name 'Out3 Volume'
+ 		value 0
+ 	}
+-	control.26 {
++	control.27 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -229,7 +239,7 @@ state.Tosa {
+ 		name 'PCBeep Bypass Headphone Volume'
+ 		value 0
+ 	}
+-	control.27 {
++	control.28 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -238,7 +248,7 @@ state.Tosa {
+ 		name 'PCBeep Bypass Speaker Volume'
+ 		value 0
+ 	}
+-	control.28 {
++	control.29 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -247,16 +257,16 @@ state.Tosa {
+ 		name 'PCBeep Bypass Phone Volume'
+ 		value 0
+ 	}
+-	control.29 {
++	control.30 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Aux Playback Headphone Volume'
+-		value 6
++		value 5
+ 	}
+-	control.30 {
++	control.31 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -265,7 +275,7 @@ state.Tosa {
+ 		name 'Aux Playback Speaker Volume'
+ 		value 0
+ 	}
+-	control.31 {
++	control.32 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -274,7 +284,7 @@ state.Tosa {
+ 		name 'Aux Playback Phone Volume'
+ 		value 0
+ 	}
+-	control.32 {
++	control.33 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -283,7 +293,7 @@ state.Tosa {
+ 		name 'Phone Volume'
+ 		value 0
+ 	}
+-	control.33 {
++	control.34 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 2
+@@ -293,7 +303,7 @@ state.Tosa {
+ 		value.0 23
+ 		value.1 23
+ 	}
+-	control.34 {
++	control.35 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -301,7 +311,7 @@ state.Tosa {
+ 		name 'Capture 20dB Boost Switch'
+ 		value true
+ 	}
+-	control.35 {
++	control.36 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -309,7 +319,7 @@ state.Tosa {
+ 		name 'Capture to Phone 20dB Boost Switch'
+ 		value true
+ 	}
+-	control.36 {
++	control.37 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -317,7 +327,7 @@ state.Tosa {
+ 		name '3D Upper Cut-off Switch'
+ 		value false
+ 	}
+-	control.37 {
++	control.38 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -325,7 +335,7 @@ state.Tosa {
+ 		name '3D Lower Cut-off Switch'
+ 		value false
+ 	}
+-	control.38 {
++	control.39 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -334,7 +344,7 @@ state.Tosa {
+ 		name '3D Playback Volume'
+ 		value 0
+ 	}
+-	control.39 {
++	control.40 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -344,7 +354,7 @@ state.Tosa {
+ 		name 'Bass Control'
+ 		value 'Adaptive Boost'
+ 	}
+-	control.40 {
++	control.41 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -352,7 +362,7 @@ state.Tosa {
+ 		name 'Bass Cut-off Switch'
+ 		value true
+ 	}
+-	control.41 {
++	control.42 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -360,7 +370,7 @@ state.Tosa {
+ 		name 'Tone Cut-off Switch'
+ 		value false
+ 	}
+-	control.42 {
++	control.43 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -368,7 +378,7 @@ state.Tosa {
+ 		name 'Playback Attenuate (-6dB) Switch'
+ 		value false
+ 	}
+-	control.43 {
++	control.44 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -377,7 +387,7 @@ state.Tosa {
+ 		name 'Bass Volume'
+ 		value 8
+ 	}
+-	control.44 {
++	control.45 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -386,7 +396,7 @@ state.Tosa {
+ 		name 'Treble Volume'
+ 		value 5
+ 	}
+-	control.45 {
++	control.46 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -394,7 +404,7 @@ state.Tosa {
+ 		name 'Capture ADC Switch'
+ 		value false
+ 	}
+-	control.46 {
++	control.47 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 2
+@@ -405,17 +415,17 @@ state.Tosa {
+ 		value.0 '+0.75dB Steps'
+ 		value.1 '+0.75dB Steps'
+ 	}
+-	control.47 {
++	control.48 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 2
+ 		comment.range '0 - 63'
+ 		iface MIXER
+ 		name 'Capture Volume'
+-		value.0 63
+-		value.1 63
++		value.0 0
++		value.1 0
+ 	}
+-	control.48 {
++	control.49 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -423,7 +433,7 @@ state.Tosa {
+ 		name 'Capture ZC Switch'
+ 		value false
+ 	}
+-	control.49 {
++	control.50 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -432,7 +442,7 @@ state.Tosa {
+ 		name 'Mic 1 Volume'
+ 		value 23
+ 	}
+-	control.50 {
++	control.51 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -441,7 +451,7 @@ state.Tosa {
+ 		name 'Mic 2 Volume'
+ 		value 23
+ 	}
+-	control.51 {
++	control.52 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -449,7 +459,7 @@ state.Tosa {
+ 		name 'Mic 20dB Boost Switch'
+ 		value false
+ 	}
+-	control.52 {
++	control.53 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -457,7 +467,7 @@ state.Tosa {
+ 		name 'Speaker Mixer PCBeep Bypass Swi'
+ 		value false
+ 	}
+-	control.53 {
++	control.54 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -465,7 +475,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Aux Playback Swit'
+ 		value false
+ 	}
+-	control.54 {
++	control.55 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -473,7 +483,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Phone Bypass Swit'
+ 		value false
+ 	}
+-	control.55 {
++	control.56 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -481,7 +491,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Line Bypass Switc'
+ 		value false
+ 	}
+-	control.56 {
++	control.57 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -489,7 +499,7 @@ state.Tosa {
+ 		name 'Speaker Mixer PCM Playback Swit'
+ 		value true
+ 	}
+-	control.57 {
++	control.58 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -497,7 +507,7 @@ state.Tosa {
+ 		name 'Phone Mixer PCBeep Bypass Switc'
+ 		value false
+ 	}
+-	control.58 {
++	control.59 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -505,7 +515,7 @@ state.Tosa {
+ 		name 'Phone Mixer Aux Playback Switch'
+ 		value false
+ 	}
+-	control.59 {
++	control.60 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -513,7 +523,7 @@ state.Tosa {
+ 		name 'Phone Mixer Line Bypass Switch'
+ 		value false
+ 	}
+-	control.60 {
++	control.61 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -521,7 +531,7 @@ state.Tosa {
+ 		name 'Phone Mixer PCM Playback Switch'
+ 		value false
+ 	}
+-	control.61 {
++	control.62 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -529,7 +539,7 @@ state.Tosa {
+ 		name 'Phone Mixer Mic 1 Sidetone Swit'
+ 		value false
+ 	}
+-	control.62 {
++	control.63 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -537,55 +547,103 @@ state.Tosa {
+ 		name 'Phone Mixer Mic 2 Sidetone Swit'
+ 		value false
+ 	}
+-	control.63 {
++	control.64 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer PCBeep Bypass Switch'
++		name 'Right HP Mixer PCBeep Bypass Sw'
+ 		value false
+ 	}
+-	control.64 {
++	control.65 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Aux Playback Switch'
++		name 'Right HP Mixer Aux Playback Swi'
+ 		value false
+ 	}
+-	control.65 {
++	control.66 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Phone Bypass Switch'
++		name 'Right HP Mixer Phone Bypass Swi'
+ 		value false
+ 	}
+-	control.66 {
++	control.67 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Line Bypass Switch'
++		name 'Right HP Mixer Line Bypass Swit'
+ 		value false
+ 	}
+-	control.67 {
++	control.68 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer PCM Playback Switch'
++		name 'Right HP Mixer PCM Playback Swi'
+ 		value true
+ 	}
+-	control.68 {
++	control.69 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Mic Sidetone Switch'
++		name 'Right HP Mixer Mic Sidetone Swi'
+ 		value false
+ 	}
+-	control.69 {
++	control.70 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer PCBeep Bypass Swi'
++		value false
++	}
++	control.71 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Aux Playback Swit'
++		value false
++	}
++	control.72 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Phone Bypass Swit'
++		value false
++	}
++	control.73 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Line Bypass Switc'
++		value false
++	}
++	control.74 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer PCM Playback Swit'
++		value true
++	}
++	control.75 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Mic Sidetone Swit'
++		value false
++	}
++	control.76 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -595,7 +653,7 @@ state.Tosa {
+ 		name 'Differential Source'
+ 		value Mic
+ 	}
+-	control.70 {
++	control.77 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -607,7 +665,7 @@ state.Tosa {
+ 		name 'Mic Select Source'
+ 		value Differential
+ 	}
+-	control.71 {
++	control.78 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -623,7 +681,7 @@ state.Tosa {
+ 		name 'Right Capture Select'
+ 		value Mic
+ 	}
+-	control.72 {
++	control.79 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -639,7 +697,7 @@ state.Tosa {
+ 		name 'Left Capture Select'
+ 		value Mic
+ 	}
+-	control.73 {
++	control.80 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -651,7 +709,7 @@ state.Tosa {
+ 		name 'Capture Phone Mux'
+ 		value Mute
+ 	}
+-	control.74 {
++	control.81 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -661,7 +719,7 @@ state.Tosa {
+ 		name 'Speaker Mux'
+ 		value 'Headphone Mix'
+ 	}
+-	control.75 {
++	control.82 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -673,7 +731,7 @@ state.Tosa {
+ 		name 'Out3 Mux'
+ 		value Left
+ 	}
+-	control.76 {
++	control.83 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -685,7 +743,7 @@ state.Tosa {
+ 		name 'ALC Sidetone Mux'
+ 		value Stereo
+ 	}
+-	control.77 {
++	control.84 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -698,15 +756,14 @@ state.Tosa {
+ 		name 'Jack Function'
+ 		value Headphone
+ 	}
+-	control.78 {
++	control.85 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+-		comment.item.0 Auto
+-		comment.item.1 On
+-		comment.item.2 Off
++		comment.item.0 On
++		comment.item.1 Off
+ 		iface MIXER
+ 		name 'Speaker Function'
+-		value Auto
++		value On
+ 	}
+ }
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 8801974fc9..3ea0d2b22f 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,12 +4,13 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
 	   file://add-poodle.patch;patch=1 \
 	   file://alsa-cxx00-default.state.patch;patch=1 \
+	   file://alsa-6000x-default.state.patch;patch=1 \
 	   file://disable-alsa-handling.patch;patch=1 \
 	   file://zaurus-hinge.matchbox-portrait \	   
 	   file://zaurus-hinge.matchbox-landscape \