merge of '0479e731919623fe441e7b76d00e8c836c573157'

and 'bcd222bb88d3e217d64a5699a87a9c1253895f1f'
author: Paul Sokolovsky <pmiscml@gmail.com> 2006-11-15 15:48:32 +0000
committer: Paul Sokolovsky <pmiscml@gmail.com> 2006-11-15 15:48:32 +0000
commit: fe6251ecd5bdd58a5b3ceda9674d57a3850f67fc (patch)
tree: 6f83d16ddb6c1348ca43425bfa9c117a48079f31 /packages
parent: af374dd518159ab5a4eaed6802f4cf50d7cf73dd (diff)
parent: 7110f87f99bed3015de53af5e42ac3fbb1fda780 (diff)
57 files changed, 2545 insertions, 288 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index ed14234d21..875f6c554b 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,14 +20,14 @@ RDEPENDS_${PN} = "${PN}-conf"
 
 ######################################################################################
 
-PR = "r48"
+PR = "r49"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 58b6a9052a..4c214796d7 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -22,14 +22,14 @@ RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb
index 84acba9f32..df9ac5abfb 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_1.1.0-wip.bb
@@ -24,14 +24,14 @@ RDEPENDS_${PN}-conf = "${PN}"
 ######################################################################################
 
 WIP_DATE = "20061108"
-PR = "${WIP_DATE}-r0"
+PR = "${WIP_DATE}-r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index 8c2fd9cc09..9a0bf12a08 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,5 +1,5 @@
 #Angstrom bootmanager image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r0"
 
 DEPENDS = "task-angstrom"
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index eb01bd53ec..838ad249c0 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -1,5 +1,5 @@
 #Angstrom bootstrap image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r2"
 
 DEPENDS = "task-base"
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index ab632f91a9..c0678431b2 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -1,5 +1,5 @@
 #Angstrom GPE image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r4"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index 763fbf22dc..e6545117b8 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,4 @@
-PV = ${DISTRO_VERSION}
+PV = "${DISTRO_VERSION}"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.7.bb
index 35d772aa0b..0a7d5520fc 100644
--- a/packages/apex/apex_1.4.5.bb
+++ b/packages/apex/apex_1.4.7.bb
@@ -23,18 +23,19 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu
 # defconfig to .config
 do_configure() {
 	rm -f ${S}/.config
-	echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
 	if test '${ARCH_BYTE_SEX}' = be
 	then
-		echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config'
-		echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config'
+	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
 	else
-		echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config'
-		echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config'
+	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
 	fi
-	sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \
-	    -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \
-		${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config
 	oe_runmake oldconfig
 }
 
diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig
index 113c69a68e..2d2784457a 100644
--- a/packages/apex/nslu2/defconfig
+++ b/packages/apex/nslu2/defconfig
@@ -48,7 +48,7 @@ CONFIG_MACH_NSLU2=y
 # CONFIG_MACH_AVILA2347 is not set
 # CONFIG_USER_DEFAULTENDIAN is not set
 # CONFIG_USER_BIGENDIAN is not set
-CONFIG_USER_LITTLEENDIAN=y
+# CONFIG_USER_LITTLEENDIAN is not set
 
 #
 # Platform Setup
@@ -89,8 +89,7 @@ CONFIG_CMD_XRECEIVE=y
 #
 # CONFIG_DRIVER_FAT is not set
 # CONFIG_DRIVER_EXT2 is not set
-CONFIG_DRIVER_JFFS2=y
-CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000"
+# CONFIG_DRIVER_JFFS2 is not set
 CONFIG_DRIVER_FIS=y
 CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k"
 CONFIG_DRIVER_NOR_CFI=y
@@ -102,21 +101,25 @@ CONFIG_USES_PATHNAME_PARSER=y
 # Environment
 #
 CONFIG_ENV=y
+# CONFIG_NO_BOOTSTRAP is not set
 CONFIG_NOR_BOOT=y
 # CONFIG_NAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
 CONFIG_AUTOBOOT=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_MUTABLE=y
 CONFIG_ENV_LINK=y
 CONFIG_ENV_REGION="nor:0x7fc000+15k"
+CONFIG_ENV_CHECK_LEN=1024
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 CONFIG_ENV_REGION_KERNEL="fis://kernel"
-CONFIG_ENV_REGION_KERNEL_SWAP=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
 # CONFIG_ENV_STARTUP_RAMDISK_COPY is not set
 CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
 CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug"
 # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
 CONFIG_USES_NOR_BOOTFLASH=y
-CONFIG_LITTLEENDIAN=y
+# CONFIG_LITTLEENDIAN is not set
 CONFIG_CLEAR_STACKS=y
 CONFIG_ALIASES=y
diff --git a/packages/busybox/slingbox-1.2.2/df_rootfs.patch b/packages/busybox/slingbox-1.2.2/df_rootfs.patch
new file mode 100644
index 0000000000..fa7e61af15
--- /dev/null
+++ b/packages/busybox/slingbox-1.2.2/df_rootfs.patch
@@ -0,0 +1,34 @@
+--- busybox-1.2.2/coreutils/df.c.orig	2006-11-11 13:25:00.000000000 -0600
++++ busybox-1.2.2/coreutils/df.c	2006-11-11 13:23:15.000000000 -0600
+@@ -47,6 +47,7 @@
+ 	struct statfs s;
+ 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ 	const char *disp_units_hdr = hdr_1k;
++	int root_done = 0;
+ 
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 	bb_opt_complementally = "h-km:k-hm:m-hk";
+@@ -112,16 +113,19 @@
+ 									   ) / (blocks_used + s.f_bavail);
+ 			}
+ 
+-			if (strcmp(device, "rootfs") == 0) {
+-				continue;
+-			} else if (strcmp(device, "/dev/root") == 0) {
++			if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
+ 				/* Adjusts device to be the real root device,
+ 				* or leaves device alone if it can't find it */
+-				if ((device = find_block_device("/")) == NULL) {
++				if ((device = find_block_device(mount_point)) == NULL) {
+ 					goto SET_ERROR;
+ 				}
+ 			}
+ 
++			if (strcmp(mount_point, "/") == 0) {
++				if (root_done) continue;
++				root_done = 1;
++			}
++
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 			bb_printf("%-20s %9s ", device,
+ 					  make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
index 8e11a09e6c..2d2d88317c 100644
--- a/packages/busybox/slingbox_1.00.bb
+++ b/packages/busybox/slingbox_1.00.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r9"
+PR = "r10"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -13,12 +14,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
index 8cd85ce540..2a86748f28 100644
--- a/packages/busybox/slingbox_1.1.3.bb
+++ b/packages/busybox/slingbox_1.1.3.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -15,12 +16,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
index 2468680ba1..523e2199f5 100644
--- a/packages/busybox/slingbox_1.2.2.bb
+++ b/packages/busybox/slingbox_1.2.2.bb
@@ -4,24 +4,20 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
            file://wget-long-options.patch;patch=1 \
            file://lazy_umount.patch;patch=1 \
+           file://df_rootfs.patch;patch=1 \
            file://slingbox_name.patch;patch=1 \
            file://halt.patch;patch=1" \
            file://slingbox.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index d5f32eb7dd..e56b41e595 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk"
 inherit autotools pkgconfig
 
 # -ldb needs this on some platforms
-export LDFLAGS += "-lpthread"
+LDFLAGS += "-lpthread"
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
 
diff --git a/packages/faad2/faad2-2.0/faad2-gcc-fix.patch b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch
new file mode 100644
index 0000000000..943b89a53f
--- /dev/null
+++ b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/mp4ff.c	2006-11-11 21:25:07.000000000 +0100
++++ faad2/common/mp4ff/mp4ff.c	2006-11-11 21:25:20.348554000 +0100
+@@ -87,7 +87,7 @@
+     if (ff) free(ff);
+ }
+ 
+-static void mp4ff_track_add(mp4ff_t *f)
++void mp4ff_track_add(mp4ff_t *f)
+ {
+     f->total_tracks++;
+ 
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index 18df582a4e..a856a1e45f 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -4,12 +4,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = ""
-PR="r1"
+PR="r2"
 
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \
-           file://Makefile.am"
+           file://faad2-gcc-fix.patch;patch=1 \
+ 	   file://Makefile.am"
 
 S="${WORKDIR}/${PN}"
 
@@ -17,7 +18,7 @@ do_configure_prepend() {
         mv ${WORKDIR}/Makefile.am ${S}/
 }
 
-PACKAGES = "${PN} libfaad libfaad-dev libmp4ff libmp4ff-dev" 
+PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" 
 
 FILES_${PN} = "${bindir}/faad"
 
diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
deleted file mode 100644
index 8c659441b3..0000000000
--- a/packages/fuse/gmailfs_0.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
-HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-LICENSE = "GPL"
-
-DEPENDS = "fuse libgmail python-fuse"
-RDEPENDS = "fuse libgmail python-fuse python-unixadmin  python-lang python-textutils python-core"
-
-SRC_URI = "http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.6.tar.gz"
-
-
-do_install() {
-install -d ${D}${datadir}/gmailfs
-install -d ${D}${bindir}
-install -d ${D}${sysconfdir}
-
-install -m 755 ${S}/gmailfs.py ${D}${datadir}/gmailfs/
-install -m 755 ${S}/mount.gmailfs ${D}${bindir}
-install -m 644 ${S}/*.conf ${D}${sysconfdir}
-
-}
-
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 66d34f09be..69353ee88e 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -7,6 +7,4 @@ FILES_${PN} += "${datadir}/xml*"
 
 do_stage() {
 	autotools_stage_all
-	}
-
-
+}
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 7073105e24..9ef1e6ee88 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,11 +6,14 @@
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
+
+COMPATIBLE_MACHINE = "nslu2"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
 IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
@@ -113,26 +116,29 @@ python () {
 # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot)
 # it is a bad idea to produce flash images without a valid RedBoot - that allows
 # an innocent user upgrade attempt to instantly brick the NSLU2.
-PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
+PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
 nslu2_pack_image() {
-	if test '${SLUGOS_FLASH_IMAGE}' = yes
+	if test '${SLUGOS_FLASH_IMAGE}' = nslu2
 	then
 		install -d ${DEPLOY_DIR_IMAGE}/slug
 		install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
 				${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 				${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 				${DEPLOY_DIR_IMAGE}/slug/
+		install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \
 			${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
+		install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/
 		cd ${DEPLOY_DIR_IMAGE}/slug
-		slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \
-			Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
+		slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \
+			-r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+			-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
 			${NSLU2_SLUGIMAGE_ARGS}
 		rm -rf ${DEPLOY_DIR_IMAGE}/slug
 	fi
diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb
index 01cca8a0c3..61629d44af 100644
--- a/packages/images/slugos-imagename.bb
+++ b/packages/images/slugos-imagename.bb
@@ -9,6 +9,7 @@ PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
 
 SLUGOS_IMAGENAME ?= "slugos"
+COMPATIBLE_MACHINE = "nslu2"
 
 do_fetch() {
 }
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index d585414f1f..3fa3607e83 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,7 +1,9 @@
 LICENSE = MIT
-PR = "r23"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
@@ -118,10 +120,3 @@ unslung_clean_image () {
 #	#### End of Hack!
 
 }
-
-python () {
-	# Don't build unslung images unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index e84e000f53..df3035371b 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -150,6 +150,12 @@ else
     #
     if test "$?" -gt 1
     then
+    
+      # Since this script is run very early in the boot-process, it should be safe to assume that the
+      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
+      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
+      chvt 1
+    
       # Surprise! Re-directing from a HERE document (as in
       # "cat << EOF") won't work, because the root is read-only.
       echo
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 3c937856ae..73c02e5ec5 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r80"
+PR = "r81"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/ipatience/.mtn2git_empty b/packages/ipatience/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipatience/.mtn2git_empty
diff --git a/packages/ipatience/files/.mtn2git_empty b/packages/ipatience/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipatience/files/.mtn2git_empty
diff --git a/packages/ipatience/files/fix-make.patch b/packages/ipatience/files/fix-make.patch
new file mode 100644
index 0000000000..3e3ad80eef
--- /dev/null
+++ b/packages/ipatience/files/fix-make.patch
@@ -0,0 +1,569 @@
+diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg
+--- ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/build/Makefile.dpkg_ipkg	2006-11-08 16:41:55.000000000 +0000
+@@ -0,0 +1,114 @@
++## Please read the README in this directory to see how to use this
++## Makefile snippet
++
++# Let's use whatever clean target the specific app provides
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# URL to source tarball
++SOURCE = ftp://gpe.handhelds.org/projects/gpe/source/$(PACKAGE)-$(VERSION).tar.gz
++
++# can change this to e.g. /var/tmp/deb
++DEB_PATH = ../deb
++
++ifeq ($(CVSBUILD),yes)
++LIBGPEWIDGET_PC = libgpewidget-uninstalled
++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
++else
++LIBGPEWIDGET_PC = libgpewidget
++endif
++
++ifeq ($(IN_LIBGPEWIDGET),)
++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
++endif
++
++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
++GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
++
++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++STANDARD_CFLAGS = -MD -Wall
++
++ifeq ($(DEBUG),yes)
++CFLAGS += -O2 -g
++LDFLAGS = -g
++else
++CFLAGS += -Os -fomit-frame-pointer
++endif
++
++dist: check-source clean dist-prep
++	rm -rf ../$(PACKAGE)-$(VERSION)
++	mkdir ../$(PACKAGE)-$(VERSION)
++	( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
++	( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
++	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
++	rm -rf ../$(PACKAGE)-$(VERSION)
++	$(MAKE) printinfo
++
++dist-upload: dist
++	scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/projects/gpe/source/
++
++dist-prep:
++ipkg-prep:
++install-mo:
++# empty, can be filled in Makefile.translation
++
++install: install-program install-mo
++
++clean-dist:
++	rm -rf familiar/dist familiar/dist.list
++
++clean: clean-dist
++
++check-source:
++	@if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
++
++ipkg: check-source ipkg-prep clean
++	rm -rf familiar/dist
++	mkdir -p familiar/dist/CONTROL
++	sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
++	if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
++	if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
++	if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
++	if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
++	if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
++	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
++	rm -rf familiar/dist.list
++	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
++	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
++	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
++	rm -rf familiar/dist familiar/dist.list
++	$(MAKE) printinfo
++
++dpkg: dist
++	mkdir -p $(DEB_PATH)
++	( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
++	mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
++	for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
++
++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
++printinfo:
++	@printf '-------------------------------------------------------------------------------\n'
++	@printf "If this becomes a package release, please add a CVS tag.\n"
++	@printf "You can use 'make tag' for that, it will execute\n"
++	@printf "   cvs tag %s\n" $(CVSTAG)
++	@printf "Please upload a tarball (created with 'make dist') to\n"
++	@printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
++	@printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
++	@printf "You can use 'make dist-upload' to do that.\n"
++	@printf "You are currently known as USER %s.\n" $(USER)
++	@printf '-------------------------------------------------------------------------------\n'
++
++tag: check-source
++	cvs tag $(CVSTAG)
++
++retag: check-source
++	cvs tag -F $(CVSTAG)
++
++source: tag dist-upload
++
++%.pc: %.pc.in
++	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
++
++.c.o:;
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
+diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/build/Makefile.translation
+--- ../ipatience-0.1-r2/ipatience/build/Makefile.translation	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/build/Makefile.translation	2006-11-08 16:41:55.000000000 +0000
+@@ -0,0 +1,107 @@
++.SUFFIXES: .mo .po .pot .po8
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# use ipkg-build or ipkg-deb-build
++IPKG_BUILD := ipkg-build
++
++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
++
++ifeq ($(DIR_PO),)
++DIR_PO := po
++endif
++
++ifeq ($(BINPACKAGE),)
++BINPACKAGE := $(PACKAGE)
++endif
++
++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++
++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
++desktop-files += $(PACKAGE).desktop
++endif
++
++ifneq ($(EXTRA_DESKTOPS),)
++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
++endif
++
++all-mo: $(mo-files)
++
++all-desktop: $(desktop-files)
++
++install-mo: all-mo
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		if [ "x$(LINGUAS)" != "x" ]; then \
++			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
++		fi; \
++	fi;
++
++.po8.mo:;
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		msgfmt -o $@ $<; \
++	fi;
++
++.po.po8:;
++	CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
++
++update-po: $(po-files) extract-po
++
++dist-prep: update-po freshen-po
++# empty
++
++ifeq ($(CVSBUILD),yes)
++ipkg-prep: freshen-po
++# empty
++endif
++
++extract-po:
++	mkdir -p $(DIR_PO)
++	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
++	if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
++
++clean: clean-po clean-dist-translation
++
++clean-po:
++	rm -rf $(DIR_PO)/*.mo
++	for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
++
++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++	intltool-merge -u -d $(DIR_PO) $< $@
++
++freshen-po:
++	rm -rf tmp-po
++	mkdir tmp-po
++	cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
++	for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
++	rm -rf tmp-po
++
++# ------------------------------------------------------------------------
++
++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
++
++ifndef BUILD
++BUILD = ../build
++endif
++
++transdist := familiar/dist-translation
++templates := $(BUILD)/familiar
++ipkglist  := translation-ipkgs.txt
++
++clean-dist-translation:
++	rm -rf $(transdist) $(ipkglist)
++
++real-translation-package: all-mo
++	rm -rf $(transdist) $(ipkglist)
++	for LINGUA in $(LINGUAS); do \
++		i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
++		mkdir -p $(transdist)/$$i/CONTROL; \
++		mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
++		install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
++		sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
++		install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
++		$(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
++	done
++
++translation-ipkg:
++	make PREFIX=/usr real-translation-package
+diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile
+--- ../ipatience-0.1-r2/ipatience/Imakefile	2001-01-31 05:25:03.000000000 +0000
++++ ipatience/Imakefile	1970-01-01 00:00:00.000000000 +0000
+@@ -1,11 +0,0 @@
+-LOCAL_LIBRARIES=-lfltk $(XFTLIB) $(XLIB) -lm
+-SRCS=main.cc table.cc cards.cc\
+-     aces.cc calc.cc canfield.cc eight.cc freecell.cc \
+-     golf.cc klondike.cc montana.cc spider.cc spiderette.cc \
+-     tabby.cc towers.cc vegas.cc wish.cc yukon.cc
+-OBJS=main.o table.o cards.o \
+-     aces.o calc.o canfield.o eight.o freecell.o \
+-     golf.o klondike.o montana.o spider.o spiderette.o \
+-     tabby.o towers.o vegas.o wish.o yukon.o
+-
+-ComplexProgramTarget(ipatience)
+diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.desktop
+--- ../ipatience-0.1-r2/ipatience/ipatience.desktop	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/ipatience.desktop	2006-11-11 15:59:25.000000000 +0000
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Name=Ipatience
++Comment=The Patience Game
++Exec=ipatience -small
++Terminal=0
++Type=Application
++Icon=ipatience.xpm
++Categories=Games
++StartupNotify=True
+diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm
+--- ../ipatience-0.1-r2/ipatience/ipatience.xpm	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/ipatience.xpm	2006-11-11 15:58:52.000000000 +0000
+@@ -0,0 +1,194 @@
++/* XPM */
++static char * ipatience_xpm[] = {
++"32 32 159 2",
++"  	c None",
++". 	c #000000",
++"+ 	c #181817",
++"@ 	c #525251",
++"# 	c #595959",
++"$ 	c #464644",
++"% 	c #0D0D0D",
++"& 	c #F4F4F1",
++"* 	c #ECEDEB",
++"= 	c #E6E9E9",
++"- 	c #F1F1EE",
++"; 	c #D5D3D0",
++"> 	c #151515",
++", 	c #748AA2",
++"' 	c #71879E",
++") 	c #6E839A",
++"! 	c #6C8197",
++"~ 	c #657B92",
++"{ 	c #95A4B4",
++"] 	c #D9D8D5",
++"^ 	c #4D6780",
++"/ 	c #3B4B5C",
++"( 	c #39414A",
++"_ 	c #344353",
++": 	c #494E53",
++"< 	c #616364",
++"[ 	c #1C1C1C",
++"} 	c #5C738A",
++"| 	c #41596F",
++"1 	c #4E5152",
++"2 	c #DEDEDB",
++"3 	c #E0DFDB",
++"4 	c #E2E2DE",
++"5 	c #E5E5E3",
++"6 	c #BCBBB8",
++"7 	c #546C82",
++"8 	c #59636D",
++"9 	c #B5BEC7",
++"0 	c #99A9B9",
++"a 	c #97A7B8",
++"b 	c #909FAF",
++"c 	c #364D62",
++"d 	c #5F6163",
++"e 	c #3E576C",
++"f 	c #3E5266",
++"g 	c #384757",
++"h 	c #8B8B8A",
++"i 	c #495D73",
++"j 	c #456079",
++"k 	c #2F4457",
++"l 	c #A1A09F",
++"m 	c #999896",
++"n 	c #9B9B9A",
++"o 	c #A3A3A2",
++"p 	c #4D4D4C",
++"q 	c #445B71",
++"r 	c #D4CBC6",
++"s 	c #777572",
++"t 	c #ADABA7",
++"u 	c #EAE9E6",
++"v 	c #52677C",
++"w 	c #334A5E",
++"x 	c #4C667E",
++"y 	c #94928F",
++"z 	c #6A6967",
++"A 	c #D3D1CD",
++"B 	c #E8E7E2",
++"C 	c #6B7F95",
++"D 	c #4D6276",
++"E 	c #5C7186",
++"F 	c #959593",
++"G 	c #686765",
++"H 	c #585654",
++"I 	c #B0AFAD",
++"J 	c #394E62",
++"K 	c #A19F9C",
++"L 	c #DAD7D3",
++"M 	c #ADADA9",
++"N 	c #283745",
++"O 	c #D3C3BC",
++"P 	c #C48F7D",
++"Q 	c #C88167",
++"R 	c #C8866E",
++"S 	c #CA9989",
++"T 	c #677B8F",
++"U 	c #62778C",
++"V 	c #CD7C60",
++"W 	c #ED8247",
++"X 	c #FB9B53",
++"Y 	c #F58E4B",
++"Z 	c #DF6F3C",
++"` 	c #E97B42",
++" .	c #F88D4A",
++"..	c #D85B31",
++"+.	c #E5E7E8",
++"@.	c #C39587",
++"#.	c #FEA458",
++"$.	c #F47C3F",
++"%.	c #F4763B",
++"&.	c #EE612E",
++"*.	c #E44C22",
++"=.	c #C1492E",
++"-.	c #C2AAA3",
++";.	c #BD7A67",
++">.	c #F98442",
++",.	c #F26C35",
++"'.	c #E9592A",
++").	c #E2431D",
++"!.	c #DC3C1A",
++"~.	c #D63113",
++"{.	c #C54022",
++"].	c #B3948C",
++"^.	c #5B6E82",
++"/.	c #BC887A",
++"(.	c #E2582B",
++"_.	c #ED5727",
++":.	c #D83817",
++"<.	c #D32D12",
++"[.	c #CD240D",
++"}.	c #C71A08",
++"|.	c #CE2F12",
++"1.	c #BD482C",
++"2.	c #B9A49E",
++"3.	c #B9C1C5",
++"4.	c #9CA3A7",
++"5.	c #6B6A69",
++"6.	c #2A3846",
++"7.	c #CBC3BF",
++"8.	c #BE533A",
++"9.	c #CB2A0F",
++"0.	c #C93F1D",
++"a.	c #AE6B5A",
++"b.	c #CDCBC8",
++"c.	c #302F2E",
++"d.	c #8A8987",
++"e.	c #53697C",
++"f.	c #CA1D0A",
++"g.	c #C33C1C",
++"h.	c #C5BCB8",
++"i.	c #C6B4AE",
++"j.	c #B05D4D",
++"k.	c #C42D14",
++"l.	c #B73F22",
++"m.	c #A87164",
++"n.	c #85929D",
++"o.	c #7C8B97",
++"p.	c #44566A",
++"q.	c #B36A5B",
++"r.	c #C8371A",
++"s.	c #B34428",
++"t.	c #A57F75",
++"u.	c #CBC9C7",
++"v.	c #A88178",
++"w.	c #868683",
++"x.	c #7F7F7D",
++"y.	c #C6C5C2",
++"z.	c #72716F",
++"A.	c #262625",
++"B.	c #50504F",
++"                                                                ",
++"    . . . . . . . . . . . . . . . . .                           ",
++"  . + @ # # # # # # # # # # # # # $ % . .                       ",
++"  . @ & * * = * * = = * * = = * - ; > . . .                     ",
++"  . # * , , , , ' ' ) ) ! ! ! ~ { ] + . .                       ",
++"  . # = ~ ^ / ( ( _ ( ( ( ( ( ( : < [ + + > . . .               ",
++"  . # = } | 1 ] ] 2 2 2 2 2 2 2 2 2 3 4 5 6 % . . .             ",
++"  . # = ' 7 8 - 9 0 0 a a a a { { { { b 9 2 + . .               ",
++"  . # = 7 c d = ! } 7 e : f / / / / g g 8 h % . . . . .         ",
++"  . # = ~ i < = 7 j k d l m n o l l l l o o o o o o p . . .     ",
++"  . # = ~ q < = ' ~ / o r s t 4 4 4 u u u * * * & & m . . .     ",
++"  . # = v w d = } x k o y z z A 4 4 4 4 4 4 B u = - m . . .     ",
++"  . # = C D < = E x k F G G H I 4 4 4 4 B u u u = & m . . .     ",
++"  . # = 7 J < = ! ~ / h K L M l r 3 4 4 L L 5 * * & n . . .     ",
++"  . # = 7 / < = x q N n 4 3 O P Q R S S Q Q S L * - n . . .     ",
++"  . # = T i < = U 7 _ o u r V W X Y Z `  .` ..P ] - m . . .     ",
++"  . # +.D k d = U 7 ( o B @.` #.X  .$.$.%.&.*.=.-.- n . . .     ",
++"  . # = E f d = D e N o 3 ;.$.>.,.'.'.).!.~.~.{.].* n . . .     ",
++"  . # = ^.f d = T } g l 5 /.(._.).:.:.<.[.}.|.1.2.- n . . .     ",
++"  . # & 3.4.5.= v q 6.o * 7.8.!.<.<.[.[.}.9.0.a.b.- m . . .     ",
++"  . c.F l d.G 5 e.q N o & u -.8.|.[.f.}.9.g.a.h.5 & m . . .     ",
++"  . . . . . # = E v ( o & u 4 i.j.k.[.9.l.m.7.5 * & n . . .     ",
++"    . . . . # * n.o.p.l & u * u 7.q.r.s.t.u.A 5 - 2 h . . .     ",
++"    . . . . $ A L 3 h o & - * * u r q.v.A * t F b.w.x.. . .     ",
++"          . . + + + % o & * * * * u ; L u - y.@ # s F . . .     ",
++"            . . . . . o & * * * * * * * * * u w.z.I n . . .     ",
++"            . . . . . F & - * * * - * - * - - u.m 4 h . . .     ",
++"              . .   . A.B.@ B.@ B.B.@ @ @ B.@ @ @ @ A.. . .     ",
++"                    . . . . . . . . . . . . . . . . . . . .     ",
++"                      . . . . . . . . . . . . . . . . . . .     ",
++"                      . . . . . . . . . . . . . . . . . . .     ",
++"                                                                "};
+diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc
+--- ../ipatience-0.1-r2/ipatience/main.cc	2001-02-09 08:15:27.000000000 +0000
++++ ipatience/main.cc	2006-11-02 16:37:55.000000000 +0000
+@@ -549,7 +549,7 @@
+ 
+ int main (int argc, char **argv) {
+     int i;
+-    small = -1;
++    small = 0;
+     Fl::args(argc,argv,i,arg_cb);
+     fl_open_display ();
+     if (small == -1)
+diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile
+--- ../ipatience-0.1-r2/ipatience/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/Makefile	2006-11-10 18:03:49.000000000 +0000
+@@ -0,0 +1,39 @@
++PREFIX = /usr
++PACKAGE = ipatience
++DEBUG = no
++CVSBUILD = no
++VERSION = 0.10
++
++MEMBERS = main aces calc canfield cards eight freecell golf klondike main montana spider spiderette tabby table towers vegas wish yukon 
++
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) 
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) -lfltk -lm
++
++DEPS = $(patsubst %,%.d,$(MEMBERS))
++OBJS = $(patsubst %,%.o,$(MEMBERS))
++SOURCES = $(patsubst %,%.cc,$(MEMBERS))
++
++ifeq ($(CVSBUILD),yes)
++BUILD = ../build
++else
++BUILD = build
++endif
++
++all: ipatience
++
++ipatience: $(OBJS)
++	$(CXX) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
++
++install-program: all ipatience.desktop
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -s ipatience $(DESTDIR)$(PREFIX)/bin/ipatience
++	install -d $(DESTDIR)$(PREFIX)/share/applications
++	install -m 644 ipatience.desktop $(DESTDIR)$(PREFIX)/share/applications/
++	install -D -m 644 ipatience.xpm $(DESTDIR)$(PREFIX)/share/pixmaps/ipatience.xpm
++
++clean: 
++	rm -f ipatience $(OBJS) $(DEPS) *.ipk *~ *.bak
++
++include $(BUILD)/Makefile.dpkg_ipkg
++-include $(DEPS)
+diff -urNd ../ipatience-0.1-r2/ipatience/table.cc ipatience/table.cc
+--- ../ipatience-0.1-r2/ipatience/table.cc	2001-06-22 00:32:12.000000000 +0000
++++ ipatience/table.cc	2006-11-10 17:06:56.000000000 +0000
+@@ -231,9 +231,9 @@
+ 	suit_bitmap = suit[Suit(card) >> 4];
+ 	
+ 	if (rank_bitmap != 0)
+-	    rank_width = rank_bitmap->w;
++	    rank_width = (short) rank_bitmap->w();
+ 	if (suit_bitmap != 0)
+-	    suit_width = suit_bitmap->w;
++	    suit_width = (short) suit_bitmap->w();
+     
+ 	if (horizontal)
+ 	{
+@@ -723,7 +723,7 @@
+ }
+ 
+ static PatI
+-abs (PatI x)
++absx (PatI x)
+ {
+     return x >= 0 ? x : -x;
+ }
+@@ -735,7 +735,7 @@
+ 	game.srcCard != NullIndex)
+     {
+ 	if (getTimeInMillis () >= downTime + TRACK_TIMEOUT ||
+-	    abs (x - downX) > TRACK_BOX || abs (y - downY) > TRACK_BOX)
++	    absx (x - downX) > TRACK_BOX || absx (y - downY) > TRACK_BOX)
+ 	{
+ 	    tracking = CardStartAnimate (x, y,
+ 					 game.srcStack, 
+@@ -985,17 +985,17 @@
+ 	cardLabelHeight = 0;
+ 	for (i = 0; i < 13; i++)
+ 	{
+-	    if (rank[0]->w > cardLabelWidth)
+-		cardLabelWidth = rank[0]->w;
+-	    if (rank[0]->h > cardLabelHeight)
+-		cardLabelHeight = rank[0]->h;
++	    if (rank[0]->w() > cardLabelWidth)
++		cardLabelWidth = rank[0]->w();
++	    if (rank[0]->h() > cardLabelHeight)
++		cardLabelHeight = rank[0]->h();
+ 	}
+ 	for (i = 0; i < 4; i++)
+ 	{
+-	    if (suit[0]->w > cardLabelWidth)
+-		cardLabelWidth = suit[0]->w;
+-	    if (suit[0]->h > cardLabelHeight)
+-		cardLabelHeight = suit[0]->h;
++	    if (suit[0]->w() > cardLabelWidth)
++		cardLabelWidth = suit[0]->w();
++	    if (suit[0]->h() > cardLabelHeight)
++		cardLabelHeight = suit[0]->h();
+ 	}
+     }
+     else
diff --git a/packages/ipatience/ipatience_0.1.bb b/packages/ipatience/ipatience_0.1.bb
new file mode 100644
index 0000000000..b223437b19
--- /dev/null
+++ b/packages/ipatience/ipatience_0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Patience game"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 xft libxtst libxpm fltk"
+PR = "r0"
+
+SRC_URI = "cvs://anoncvs@keithp.com/local/src/CVS;method=pserver;module=ipatience \
+          file://fix-make.patch;patch=1"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools
+
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 039308ac47..dcff23b645 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r6"
+PR = "r8"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
@@ -26,3 +26,8 @@ do_install() {
 	install ${S}/NPE-B ${D}/${base_libdir}/firmware/
 }
 
+do_populate_staging() {
+	install -d ${STAGING_FIRMWARE_DIR}
+	install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+}
+
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 659a5147bb..342197c8ad 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -1,11 +1,12 @@
-PR = "r4"
+DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
+LICENSE ="jpeg"
 SECTION = "libs"
 PRIORITY = "required"
+
 DEPENDS = "libtool-cross"
-DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
-PACKAGES += "jpeg-tools "
-FILES_jpeg-tools = "${bindir}/*"
-LICENSE ="jpeg"
+
+PR = "r5"
+
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
 	   file://ldflags.patch;patch=1 \
@@ -33,3 +34,8 @@ do_install() {
 		   ${D}${mandir}/man1 ${D}${libdir}
 	oe_runmake 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ 		"jpeg-tools "
+FILES_jpeg-tools = 	"${bindir}/*"
+
+
diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb
index b1b7e0e4c2..5af8fa687a 100644
--- a/packages/libao/libao-alsa_0.8.6.bb
+++ b/packages/libao/libao-alsa_0.8.6.bb
@@ -4,8 +4,7 @@ HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib libao"
-RDEPENDS = "libao2 (>=${PV})"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 S = "${WORKDIR}/libao-${PV}"
diff --git a/packages/libao/libao-plugin-alsa_0.8.6.bb b/packages/libao/libao-plugin-alsa_0.8.6.bb
index 91cbc6f2d3..86dc4afc14 100644
--- a/packages/libao/libao-plugin-alsa_0.8.6.bb
+++ b/packages/libao/libao-plugin-alsa_0.8.6.bb
@@ -4,10 +4,9 @@ HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib libao"
-RDEPENDS = "libao2 (>=${PV})"
 PROVIDES = "libao-alsa"
 PACKAGES = "libao-alsa libao-alsa-dev"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 S = "${WORKDIR}/libao-${PV}"
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index 7be8ffd0ac..a1813423c0 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -2,3 +2,7 @@ SECTION = "unknown"
 require libpcre_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
+
+# NOTE: multiple providers are available (libpcre, libpcre-native);
+# NOTE: consider defining PREFERRED_PROVIDER_pcre
+PROVIDES = "" 
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
index 3b1453c38b..bfb9dccb80 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc3.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "534"
+IXP4XX_KERNEL_SVN_REV = "577"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/mx31ads-kernel/.mtn2git_empty b/packages/linux/mx31ads-kernel/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/mx31ads-kernel/.mtn2git_empty
diff --git a/packages/linux/mx31ads-kernel/imx31ads_defconfig b/packages/linux/mx31ads-kernel/imx31ads_defconfig
new file mode 100644
index 0000000000..3836ed03ea
--- /dev/null
+++ b/packages/linux/mx31ads-kernel/imx31ads_defconfig
@@ -0,0 +1,1742 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc5
+# Mon Nov 13 12:42:45 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+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
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Freescale MXC Implementations
+#
+CONFIG_ARCH_MX3=y
+
+#
+# MX3 Options
+#
+CONFIG_MACH_MX31ADS=y
+# CONFIG_MX3_DOZE_DURING_IDLE is not set
+CONFIG_ISP1504_MXC=m
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V6=y
+# CONFIG_CPU_32v6K is not set
+CONFIG_CPU_32v6=y
+CONFIG_CPU_ABRT_EV6=y
+CONFIG_CPU_CACHE_V6=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V6=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_CACHE_L210=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+
+#
+# Bus support
+#
+CONFIG_ISA=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_MX31ADS=m
+CONFIG_PCMCIA_PROBE=y
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE 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_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="noinitrd console=ttymxc0 root=/dev/mtdblock2 rw ip=off"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+
+#
+# MXC support drivers
+#
+
+#
+# MXC IPU
+#
+CONFIG_MXC_IPU=y
+CONFIG_MXC_IPU_PF=y
+
+#
+# MXC SPI support
+#
+CONFIG_MXC_SPI=y
+# CONFIG_MXC_SPI_SELECT1 is not set
+CONFIG_MXC_SPI_SELECT2=y
+# CONFIG_MXC_SPI_SELECT3 is not set
+
+#
+# MXC SSI support
+#
+CONFIG_MXC_SSI=y
+
+#
+# MXC Digital Audio Multiplexer support
+#
+CONFIG_MXC_DAM=y
+
+#
+# MC13783_LEGACY support
+#
+CONFIG_MXC_MC13783_LEGACY=y
+CONFIG_MXC_MC13783_ADC=y
+CONFIG_MXC_MC13783_AUDIO=y
+CONFIG_MXC_MC13783_RTC=y
+CONFIG_MXC_MC13783_LIGHT=y
+CONFIG_MXC_MC13783_BATTERY=y
+CONFIG_MXC_MC13783_CONNECTIVITY=y
+CONFIG_MXC_MC13783_POWER=y
+
+#
+# Advanced Power Management devices
+#
+CONFIG_MXC_DPTC=y
+CONFIG_MXC_DVFS=y
+CONFIG_MXC_DVFS_SDMA=y
+
+#
+# MXC Security Drivers
+#
+CONFIG_MXC_SECURITY_SCC=y
+CONFIG_MXC_SECURITY_RNGA=y
+# CONFIG_MXC_RNGA_TEST_DEBUG is not set
+CONFIG_MXC_SECURITY_RTIC=y
+# CONFIG_MXC_RTIC_TEST_DEBUG is not set
+CONFIG_MXC_SECURITY_CORE=y
+
+#
+# SDMA
+#
+CONFIG_MXC_SDMA_API=y
+
+#
+# MXC MPEG4 Encoder Kernel module support
+#
+CONFIG_MXC_HMP4E=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_APM is not set
+
+#
+# Dynamic Power Management
+#
+CONFIG_DPM=y
+# CONFIG_DPM_STATS is not set
+CONFIG_DPM_PROCFS=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+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"
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+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 is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_MXC_FIR=m
+# CONFIG_MCS_FIR is not set
+# CONFIG_BT 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 is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+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=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# 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 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=y
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_PLATRAM is not set
+CONFIG_MTD_MXC=y
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_NAND_MXC_SWECC=y
+CONFIG_MTD_NAND_MXC_FORCE_CE=y
+CONFIG_MTD_NAND_MXC_ECC_CORRECTION_OPTION2=y
+CONFIG_CONFIG_MXC_NAND_LOW_LEVEL_ERASE=y
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+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=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDE_MXC=m
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
+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 is not set
+# CONFIG_CHR_DEV_SG is not set
+# 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
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+CONFIG_CS89x0=y
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_ARLAN is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=m
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# 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_KEYBOARD_MXC=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO 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
+CONFIG_MXC_RTC=y
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_MXC=y
+CONFIG_SERIAL_MXC_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_MXC_WATCHDOG=y
+
+#
+# ISA-based Watchdog Cards
+#
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_WDT is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_MXC=y
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+CONFIG_MXC_I2C_CLIENT=y
+# 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 is not set
+
+#
+# SPI Protocol Masters
+#
+
+#
+# Dallas's 1-wire bus
+#
+CONFIG_W1=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+CONFIG_W1_MXC=y
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 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_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D 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
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+
+#
+# Video Capture Adapters
+#
+
+#
+# Video Capture Adapters
+#
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_PMS is not set
+CONFIG_VIDEO_MXC_CAMERA=y
+
+#
+# MXC Camera/V4L2 PRP Features support
+#
+CONFIG_VIDEO_MXC_IPU_CAMERA=y
+CONFIG_MXC_CAMERA_MICRON111=y
+CONFIG_MXC_IPU_PRP_VF_SDC=y
+CONFIG_MXC_IPU_PRP_ENC=y
+CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_IPU_OUTPUT=y
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+
+#
+# V4L USB devices
+#
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_USB_DSBR is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_MXC=y
+CONFIG_FB_MXC_16BPP=y
+# CONFIG_FB_MXC_24BPP is not set
+# CONFIG_FB_MXC_32BPP is not set
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXC_SHARP_QVGA_PANEL=y
+# CONFIG_FB_MXC_VGA_PANEL is not set
+# CONFIG_FB_MXC_TVOUT is not set
+# CONFIG_FB_MXC_OVERLAY is not set
+# CONFIG_FB_MXC_ASYNC_PANEL is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=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_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_MXC=y
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# 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 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX 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_ARC=y
+CONFIG_USB_ARC=m
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_GADGET_ARC_OTGFS is not set
+CONFIG_USB_GADGET_ARC_OTGHS=y
+# CONFIG_USB_ZERO is not set
+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
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=m
+# CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_MXC=m
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# 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
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_V3020 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=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=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 is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+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 is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS 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=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 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_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS 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 is not set
+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
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Profiling support
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+
+#
+# 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_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_FS is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_USER=y
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc5.bb b/packages/linux/mx31ads-kernel_2.6.19rc5.bb
new file mode 100644
index 0000000000..97fa499632
--- /dev/null
+++ b/packages/linux/mx31ads-kernel_2.6.19rc5.bb
@@ -0,0 +1,42 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the MX31ADS"
+LICENSE = "GPL"
+MAINTAINER = "Liam Girdwood <liam.girdwood@wolfsonmicro.com>"
+PR = "r1"
+
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
+    http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc5.bz2;patch=1 \
+    http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc5-lg3.patch.bz2;patch=1 \
+    file://imx31ads_defconfig"
+
+S = "${WORKDIR}/linux-2.6.18"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+inherit kernel
+inherit package
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/imx31ads_defconfig ${S}/.config
+#	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
+COMPATIBLE_MACHINE = "mx31ads"
+
+# to get module dependencies working
+KERNEL_RELEASE = "2.6.19-rc5"
+
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index fd8afd1090..348fccf44b 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,4 +1,5 @@
 SECTION = "kernel"
+COMPATIBLE_MACHINE = "nslu2"
 
 require nslu2-linksys-kernel_2.4.22.bb
 
@@ -27,5 +28,3 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
 	    ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
index dfe2ec029e..2b6d64c5e5 100644
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
 LICENSE = MIT
-PR = "r0"
+PR = "r1"
+COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 21a55ae957..9bd77ff746 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Packages that are compatible with the Unslung firmware"
 LICENSE = MIT
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index b8db38d3db..6d13d092c1 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,16 +2,12 @@ SECTION = "base"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
 
 do_compile () {
 	install -d ${STAGING_LIBDIR}/nslu2-binaries
diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
index 4424e99d19..86b0a575eb 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -16,8 +16,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/lib"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
index 007b19cbb2..b098ba73ff 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -13,8 +13,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
index 4aace52412..44ef8aa1c9 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -22,8 +22,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/etc/samba/codepages"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling
index 79584df8b7..6c4dc4ca52 100755
--- a/packages/nslu2-binary-only/unslung-rootfs/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs/unsling
@@ -185,9 +185,10 @@ fi
 # /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ
 # rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
 # rm -rf $targ/var ; mv $targ/var.state $targ/var
-echo "./var/tmp"    > /tmp/xfile
+echo "./var/tmp" > /tmp/xfile
 echo "./dev.state" >> /tmp/xfile
 echo "./var.state" >> /tmp/xfile
+echo "./lost+found" >>/tmp/xfile
 mkdir -p /tmp/tmprootfs
 /bin/mount /dev/mtdblock4 /tmp/tmprootfs
 /bin/tar -c -C /tmp/tmprootfs -X /tmp/xfile -f - . | (cd $targ; /bin/tar -x -f -)
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 290d2debbc..f6b65aad2a 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,7 @@
 SECTION = "base"
+COMPATIBLE_MACHINE = "nslu2"
 
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -58,13 +59,6 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
 
 S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
 
-python () {
-	# Don't build unslung images unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
-
 do_compile () {
 	echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung
 
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
index 1a1c43344f..5f1f6b041f 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
@@ -3,17 +3,5 @@ LICENSE = "GPL"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-
-DEPENDS = "opie-mediaplayer1 \
-           opie-mediaplayer1-libtremorplugin \
-           opie-mediaplayer2-skin-default \
-	   libogg \
-           libvorbis \
-           libmad "
-
-RDEPENDS = "opie-mediaplayer1 \
-           opie-mediaplayer1-libtremorplugin \
-	   opie-mediaplayer2-skin-default \
-	   libogg0 \
-           libmad0 \
-           libvorbis "
+RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
+PR = "r1"
diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb
index 6ce7c3eab5..ee6c648e9b 100644
--- a/packages/portmap/portmap-unslung_5-7.bb
+++ b/packages/portmap/portmap-unslung_5-7.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index 6ce7c3eab5..ee6c648e9b 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index c8d9220da6..12e0a043b3 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -4,7 +4,7 @@ SECTION = "console/graphics"
 #Make this a weak assigment to allow branding of the povray binary 
 LICENSE = "povray"
 
-DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
+DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
 RDEPENDS = ""
 
 PR = "r1"
diff --git a/packages/slugimage/slugimage-native.bb b/packages/slugimage/slugimage-native.bb
index 81328ae414..8b60ff1b59 100644
--- a/packages/slugimage/slugimage-native.bb
+++ b/packages/slugimage/slugimage-native.bb
@@ -9,5 +9,5 @@ inherit native
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 do_stage () {
-	install -m 0755 slugimage/slugimage ${STAGING_BINDIR}/
+	install -m 0755 slugimage ${STAGING_BINDIR}/
 }
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index 6b672cdc23..d553a21777 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,14 +3,22 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r4"
+PR = "r6"
 
 RDEPENDS = "perl"
 
-SRC_URI = "cvs://anonymous:@nslu.cvs.sourceforge.net/cvsroot/nslu;module=slugimage;tag=SLUGIMAGE_3_2"
+SLUGIMAGE_SVN_REV  ?= 77
+SLUGIMAGE_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/slugimage/trunk
+
+addtask svnfetch before do_configure after do_patch
+
+do_svnfetch() {
+	svn co ${SLUGIMAGE_SVN_REPO} --revision ${SLUGIMAGE_SVN_REV} ${WORKDIR}
+}
+
 S = "${WORKDIR}"
 
 do_install () {
 	install -d ${D}${bindir}
-	install -m 0755 slugimage/slugimage ${D}${bindir}/
+	install -m 0755 slugimage ${D}${bindir}/
 }
diff --git a/packages/tasks/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
deleted file mode 100644
index 82c11537f8..0000000000
--- a/packages/tasks/task-essential-parts.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-parts.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "Creates all task-essential-* tasks"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r1"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-ALLOW_EMPTY = 1
-
-PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
-	    task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
-	    task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
-	    task-essential-userspace task-essential-serial"
-
-######################################################################################
-
-DISTRO_PCMCIA ?= ""
-
-DISTRO_SERIAL ?= ""
-DISTRO_IRDA ?= ""
-DISTRO_BLUETOOTH ?= ""
-DISTRO_SOUND ?= ""
-DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		wireless-tools wpa-supplicant-nossl"
-
-DISTRO_USBCLIENT ?= ""
-DISTRO_USBHOST ?= ""
-
-DISTRO_SD ?= ""
-
-DISTRO_USERSPACE ?= "ipkg keymaps"
-
-DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		   ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
-
-######################################################################################
-
-RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
-RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
-RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
-RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
-RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
-RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
-RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
-RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
-RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
-RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
-RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
-RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
-
-
-DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
deleted file mode 100644
index 565823298a..0000000000
--- a/packages/tasks/task-essential-to-boot.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-to-boot.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r0"
-
-######################################################################################
-
-CORE_EXTRA_D ?= ""
-CORE_EXTRA_RD ?= ""
-
-CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
-		   sysvinit tinylogin ${CORE_EXTRA_D}"
-
-CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
-		    tinylogin ${CORE_EXTRA_RD}"
-
-######################################################################################		    
-		    
-DEPENDS = "${CORE_PACKAGES_D}"
-RDEPENDS = "${CORE_PACKAGES_RD}"
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index d6a73739f5..e9c263545d 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -74,7 +74,6 @@ RDEPENDS_task-qpe-games = "\
     froot \
     gemdropx \
     glider \
-    gnuz \
     hexatrolic \
     iaimaster \
     icebloxx \
@@ -130,11 +129,6 @@ RDEPENDS_task-qpe-emulators = "scummvm"
 RDEPENDS_task-qpe-fonts = "\
     qpf-bitstream-vera-large \
     qpf-bitstream-vera-sans-mono-huge \
-    qpf-dejavusans \
-    qpf-dejavusanscondensed \
-    qpf-dejavusansmono \
-    qpf-dejavuserif \
-    qpf-dejavuserifcondensed \
     qpf-freemono \
     qpf-freeserif \
     ttf-gentium \
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 0249cb56fd..729f176a75 100644
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
 SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug;tag=${SRC_TAG}"
@@ -25,10 +26,3 @@ do_compile() {
 do_stage() {
 	oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-	# Don't build upslug unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index 7099b3ba44..95b340c589 100644
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 # Use releases in preference
 DEFAULT_PREFERENCE = "-1"
@@ -24,10 +25,3 @@ do_compile() {
 do_stage() {
 	oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-	# Don't build upslug unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 0a91bc3fd1..9bee027034 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -1,11 +1,12 @@
 # This package builds the 'upslug2' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool (version 2)"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
+COMPATIBLE_MACHINE = "nslu2"
 
 # On Linux libpcap does not work.  Using libpcap is sub-optimal - it
 # is intended for packet capture not management of a new protocol
@@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}"
 
 PACKAGES = "${PN}"
 EXTRA_OECONF += "${LIBPCAP_OECONF}"
-
-python () {
-	# Don't build upslug2 unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
-}
author	Paul Sokolovsky <pmiscml@gmail.com>	2006-11-15 15:48:32 +0000
committer	Paul Sokolovsky <pmiscml@gmail.com>	2006-11-15 15:48:32 +0000
commit	fe6251ecd5bdd58a5b3ceda9674d57a3850f67fc (patch)
tree	6f83d16ddb6c1348ca43425bfa9c117a48079f31 /packages
parent	af374dd518159ab5a4eaed6802f4cf50d7cf73dd (diff)
parent	7110f87f99bed3015de53af5e42ac3fbb1fda780 (diff)