merge of '18d4581dca99c8e61139671a08cebbf98f7a7f1a'

     and '2b6814f21f9de4de32873a38a5c277fc38317415'

57 files changed, 3145 insertions, 1356 deletions

diff --git a/packages/fbreader/fbreader_0.7.3b.bb b/packages/fbreader/fbreader_0.7.3b.bb
deleted file mode 100644
index 9e7d546780..0000000000
--- a/packages/fbreader/fbreader_0.7.3b.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
-HOMEPAGE = "http://only.mawhrin.net/fbreader/"
-SECTION = "x11/utils"
-PRIORITY = "optional"
-DEPENDS = "gtk+ enca expat"
-
-SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
-	file://hack-makefile.patch;patch=1 \
-	file://set-target.patch;patch=1 \
-	file://change-desktop.patch;patch=1"
-
-FILES_${PN} += "/usr/share/FBReader"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-	install -d ${D}${datadir}/applications
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/pdaxrom/usr/share/applications/FBReader.desktop ${D}${datadir}/applications/fbreader.desktop
-	install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/icons/34x28/FBReader.png ${D}${datadir}/pixmaps/fbreader.png
-}
diff --git a/packages/file/file-native_4.16.bb b/packages/file/file-native_4.16.bb
deleted file mode 100644
index 63554b01fb..0000000000
--- a/packages/file/file-native_4.16.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require file_${PV}.bb
-inherit native
-
-# avoid dependency loop
-DEPENDS = ""
-PR = "r1"
-
-SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/file/file_4.16.bb b/packages/file/file_4.16.bb
deleted file mode 100644
index b2c2e6ed91..0000000000
--- a/packages/file/file_4.16.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-SECTION = "console/utils"
-LICENSE = "BSD-ADV"
-DEPENDS = "file-native"
-
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz"
-S = "${WORKDIR}/file-${PV}"
-
-inherit autotools
-
-do_configure_prepend() {
-	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
-}
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb
index 669187e0c7..fa0de0bbc3 100644
--- a/packages/frodo/frodo_4.1b.bb
+++ b/packages/frodo/frodo_4.1b.bb
@@ -4,7 +4,7 @@ DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \
+SRC_URI = "http://frodo.cebix.net/downloads/FrodoV4_1b.Src.tar.gz \
            file://frodo-qte.diff;patch=1 \
            file://frodo-joystick-4state.diff;patch=1 \
            file://frodorc \
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 5721dee50b..f69ab5c8b3 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r9"
+PR = "r10"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc
index 62a7bf3b23..1bfdef64c5 100644
--- a/packages/gcc/gcc3-build-cross.inc
+++ b/packages/gcc/gcc3-build-cross.inc
@@ -41,4 +41,8 @@ do_stage_append () {
 	do
 		rm -rf ${CROSS_DIR}/$d
 	done
+
+	#fix up libsupc++ and libstdc++ la files
+	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs = '-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la
+	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs = '-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la
 }
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
new file mode 100644
index 0000000000..c72714dc7f
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
+HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
+LICENSE = "nokia"
+PRIORITY = "optional"
+SECTION = "gpe"
+
+PV = "0.5.0+svn${SRCDATE}"
+PR = "r0"
+
+DEPENDS = "curl librsvg osb-nrcore"
+
+SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
+S = "${WORKDIR}/NRCit"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig
+
+do_configure () {
+	autotools_do_configure
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage () {
+	oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+
+	install -d ${STAGING_INCDIR}/osb
+	install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb
+	install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb
+}
diff --git a/packages/zlib/files/.mtn2git_empty b/packages/keymaps/files/htcuniversal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zlib/files/.mtn2git_empty
+++ b/packages/keymaps/files/htcuniversal/.mtn2git_empty
diff --git a/packages/keymaps/files/htcuniversal/keymap-2.6.map b/packages/keymaps/files/htcuniversal/keymap-2.6.map
new file mode 100644
index 0000000000..91ca66e0a1
--- /dev/null
+++ b/packages/keymaps/files/htcuniversal/keymap-2.6.map
@@ -0,0 +1,10 @@
+#altgr keycode 18 = euro
+altgr keycode 15 = tilde
+altgr keycode 24 = slash
+altgr keycode 25 = backslash
+altgr keycode 32 = pound
+altgr keycode 37 = quotedbl
+altgr keycode 38 = apostrophe
+altgr keycode 50 = question
+altgr keycode 51 = semicolon
+altgr keycode 52 = colon
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 2766fad2f4..a441292472 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r11"
+PR = "r12"
 
 inherit update-rc.d
 
@@ -17,6 +17,7 @@ SRC_URI_append_collie       = " file://keymap-*.map"
 SRC_URI_append_poodle       = " file://keymap-*.map"
 SRC_URI_append_jornada6xx   = " file://keymap-*.map"
 SRC_URI_append_h2200        = " file://keymap-*.map"
+SRC_URI_append_htcuniversal = " file://keymap-*.map"
 
 INITSCRIPT_NAME = "keymap"
 INITSCRIPT_PARAMS = "start 00 S ."
@@ -26,7 +27,7 @@ do_install () {
     install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200)
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htuniversal )
             install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
             ;;
         *)
diff --git a/packages/linux/devkitidp-pxa255-2.6.19/.mtn2git_empty b/packages/linux/devkitidp-pxa255-2.6.19/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/devkitidp-pxa255-2.6.19/.mtn2git_empty
diff --git a/packages/linux/devkitidp-pxa255-2.6.19/defconfig b/packages/linux/devkitidp-pxa255-2.6.19/defconfig
new file mode 100644
index 0000000000..23bf0167f6
--- /dev/null
+++ b/packages/linux/devkitidp-pxa255-2.6.19/defconfig
@@ -0,0 +1,1156 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19
+# Sat Jan  6 12:58:12 2007
+#
+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_ARCH_MTD_XIP=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_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 is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# 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 is not set
+# 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 is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# 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_PXA=y
+# 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
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+CONFIG_ARCH_PXA_IDP=y
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+CONFIG_PXA25x=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI 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=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mtdparts=phys_mapped_flash:256k(boot)ro,0x1C0000(kernel),-(root)"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+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 is not set
+# 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 is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE 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"
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER 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 is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# 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 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 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+# CONFIG_MTD_CFI_I1 is not set
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0000000
+CONFIG_MTD_PHYSMAP_LEN=0x4000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=4
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# 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 is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_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 is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# 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 is not set
+# 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 is not set
+# 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_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
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA 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 is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# 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=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=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_IDPKBD=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=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_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 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 is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGERS is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV 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_S1D13XXX is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_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=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND 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=y
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_BANDWIDTH=y
+# CONFIG_USB_DYNAMIC_MINORS 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_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV 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
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+CONFIG_MMC_DEBUG=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_PXA=y
+# CONFIG_MMC_TIFM_SD is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS 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 is not set
+# CONFIG_EXT4DEV_FS is not set
+# 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 is not set
+# 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 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 is not set
+# 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 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+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 is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# 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 is not set
+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 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_ERRORS=y
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# 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/devkitidp-pxa255-2.6.19/linux-2.6.19_devkitidp1.patch b/packages/linux/devkitidp-pxa255-2.6.19/linux-2.6.19_devkitidp1.patch
new file mode 100644
index 0000000000..783ecaef43
--- /dev/null
+++ b/packages/linux/devkitidp-pxa255-2.6.19/linux-2.6.19_devkitidp1.patch
@@ -0,0 +1,1586 @@
+Index: linux-2.6.19/arch/arm/configs/pxa255-idp_defconfig
+===================================================================
+--- linux-2.6.19.orig/arch/arm/configs/pxa255-idp_defconfig
++++ linux-2.6.19/arch/arm/configs/pxa255-idp_defconfig
+@@ -1,14 +1,13 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.12-rc1-bk2
+-# Sun Mar 27 22:20:17 2005
++# Linux kernel version: 2.6.13
++# Fri Sep  2 11:36:29 2005
+ #
+ CONFIG_ARM=y
+ CONFIG_MMU=y
+ CONFIG_UID16=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+ CONFIG_GENERIC_CALIBRATE_DELAY=y
+-CONFIG_GENERIC_IOMAP=y
+ 
+ #
+ # Code maturity level options
+@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_CLEAN_COMPILE=y
+ CONFIG_BROKEN_ON_SMP=y
++CONFIG_INIT_ENV_ARG_LIMIT=32
+ 
+ #
+ # General setup
+@@ -34,6 +34,8 @@ CONFIG_KOBJECT_UEVENT=y
+ CONFIG_KALLSYMS=y
+ # CONFIG_KALLSYMS_ALL is not set
+ # CONFIG_KALLSYMS_EXTRA_PASS is not set
++CONFIG_PRINTK=y
++CONFIG_BUG=y
+ CONFIG_BASE_FULL=y
+ CONFIG_FUTEX=y
+ CONFIG_EPOLL=y
+@@ -50,11 +52,12 @@ CONFIG_BASE_SMALL=0
+ # Loadable module support
+ #
+ CONFIG_MODULES=y
+-# CONFIG_MODULE_UNLOAD is not set
++CONFIG_MODULE_UNLOAD=y
++CONFIG_MODULE_FORCE_UNLOAD=y
+ CONFIG_OBSOLETE_MODPARM=y
+ # CONFIG_MODVERSIONS is not set
+ # CONFIG_MODULE_SRCVERSION_ALL is not set
+-# CONFIG_KMOD is not set
++CONFIG_KMOD=y
+ 
+ #
+ # System Type
+@@ -79,6 +82,7 @@ CONFIG_ARCH_PXA=y
+ # CONFIG_ARCH_VERSATILE is not set
+ # CONFIG_ARCH_IMX is not set
+ # CONFIG_ARCH_H720X is not set
++# CONFIG_ARCH_AAEC2000 is not set
+ 
+ #
+ # Intel PXA2xx Implementations
+@@ -98,7 +102,6 @@ CONFIG_CPU_32v5=y
+ CONFIG_CPU_ABRT_EV5T=y
+ CONFIG_CPU_CACHE_VIVT=y
+ CONFIG_CPU_TLB_V4WBI=y
+-CONFIG_CPU_MINICACHE=y
+ 
+ #
+ # Processor Features
+@@ -109,16 +112,35 @@ CONFIG_XSCALE_PMU=y
+ #
+ # Bus support
+ #
++CONFIG_ISA_DMA_API=y
+ 
+ #
+ # PCCARD (PCMCIA/CardBus) support
+ #
+-# CONFIG_PCCARD is not set
++CONFIG_PCCARD=y
++CONFIG_PCMCIA_DEBUG=y
++CONFIG_PCMCIA=y
++CONFIG_PCMCIA_LOAD_CIS=y
++CONFIG_PCMCIA_IOCTL=y
++
++#
++# PC-card bridges
++#
++# CONFIG_TCIC is not set
++CONFIG_PCMCIA_PXA2XX=y
+ 
+ #
+ # Kernel Features
+ #
+ # CONFIG_PREEMPT is not set
++# CONFIG_NO_IDLE_HZ 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_LEDS=y
+ CONFIG_LEDS_TIMER=y
+ CONFIG_LEDS_CPU=y
+@@ -129,7 +151,7 @@ CONFIG_ALIGNMENT_TRAP=y
+ #
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+-CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M"
++CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mtdparts=phys_mapped_flash:256k(boot)ro,0x1C0000(kernel),-(root)"
+ # CONFIG_XIP_KERNEL is not set
+ 
+ #
+@@ -157,6 +179,67 @@ CONFIG_BINFMT_ELF=y
+ # CONFIG_PM is not set
+ 
+ #
++# Networking
++#
++CONFIG_NET=y
++
++#
++# Networking options
++#
++# CONFIG_PACKET is not set
++CONFIG_UNIX=y
++# CONFIG_NET_KEY is not set
++CONFIG_INET=y
++# CONFIG_IP_MULTICAST is not set
++# 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 is not set
++# CONFIG_IP_PNP_RARP is not set
++# CONFIG_NET_IPIP is not set
++# CONFIG_NET_IPGRE 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_TUNNEL is not set
++CONFIG_IP_TCPDIAG=y
++# CONFIG_IP_TCPDIAG_IPV6 is not set
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_BIC=y
++# CONFIG_IPV6 is not set
++# CONFIG_NETFILTER is not set
++
++#
++# SCTP Configuration (EXPERIMENTAL)
++#
++# CONFIG_IP_SCTP 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_NET_DIVERT is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_NET_SCHED is not set
++# CONFIG_NET_CLS_ROUTE is not set
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++
++#
+ # Device Drivers
+ #
+ 
+@@ -165,7 +248,7 @@ CONFIG_BINFMT_ELF=y
+ #
+ CONFIG_STANDALONE=y
+ CONFIG_PREVENT_FIRMWARE_BUILD=y
+-# CONFIG_FW_LOADER is not set
++CONFIG_FW_LOADER=y
+ # CONFIG_DEBUG_DRIVER is not set
+ 
+ #
+@@ -176,7 +259,7 @@ CONFIG_MTD=y
+ # CONFIG_MTD_CONCAT is not set
+ CONFIG_MTD_PARTITIONS=y
+ # CONFIG_MTD_REDBOOT_PARTS is not set
+-# CONFIG_MTD_CMDLINE_PARTS is not set
++CONFIG_MTD_CMDLINE_PARTS=y
+ # CONFIG_MTD_AFS_PARTS is not set
+ 
+ #
+@@ -209,6 +292,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
+ CONFIG_MTD_CFI_I2=y
+ # CONFIG_MTD_CFI_I4 is not set
+ # CONFIG_MTD_CFI_I8 is not set
++# CONFIG_MTD_OTP is not set
+ CONFIG_MTD_CFI_INTELEXT=y
+ # CONFIG_MTD_CFI_AMDSTD is not set
+ # CONFIG_MTD_CFI_STAA is not set
+@@ -222,10 +306,14 @@ CONFIG_MTD_CFI_UTIL=y
+ # Mapping drivers for chip access
+ #
+ # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+-# CONFIG_MTD_PHYSMAP is not set
++CONFIG_MTD_PHYSMAP=y
++CONFIG_MTD_PHYSMAP_START=0x0000000
++CONFIG_MTD_PHYSMAP_LEN=0x4000000
++CONFIG_MTD_PHYSMAP_BANKWIDTH=4
+ # CONFIG_MTD_ARM_INTEGRATOR is not set
+ # CONFIG_MTD_EDB7312 is not set
+ # CONFIG_MTD_SHARP_SL is not set
++# CONFIG_MTD_PLATRAM is not set
+ 
+ #
+ # Self-contained MTD device drivers
+@@ -260,10 +348,10 @@ CONFIG_MTD_CFI_UTIL=y
+ #
+ # Block devices
+ #
+-# CONFIG_BLK_DEV_FD is not set
+ # CONFIG_BLK_DEV_COW_COMMON is not set
+ # CONFIG_BLK_DEV_LOOP is not set
+ # CONFIG_BLK_DEV_NBD is not set
++# CONFIG_BLK_DEV_UB is not set
+ # CONFIG_BLK_DEV_RAM is not set
+ CONFIG_BLK_DEV_RAM_COUNT=16
+ CONFIG_INITRAMFS_SOURCE=""
+@@ -290,9 +378,11 @@ CONFIG_BLK_DEV_IDE=y
+ # CONFIG_BLK_DEV_IDE_SATA is not set
+ CONFIG_BLK_DEV_IDEDISK=y
+ # CONFIG_IDEDISK_MULTI_MODE is not set
++# CONFIG_BLK_DEV_IDECS is not set
+ # CONFIG_BLK_DEV_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
+ 
+ #
+@@ -307,89 +397,69 @@ CONFIG_BLK_DEV_IDEDISK=y
+ #
+ # SCSI device support
+ #
+-# CONFIG_SCSI is not set
++CONFIG_SCSI=y
++CONFIG_SCSI_PROC_FS=y
+ 
+ #
+-# Multi-device support (RAID and LVM)
++# SCSI support type (disk, tape, CD-ROM)
+ #
+-# CONFIG_MD is not set
++# CONFIG_BLK_DEV_SD is not set
++# 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
+ 
+ #
+-# Fusion MPT device support
++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+ #
++# CONFIG_SCSI_MULTI_LUN is not set
++# CONFIG_SCSI_CONSTANTS is not set
++# CONFIG_SCSI_LOGGING is not set
+ 
+ #
+-# IEEE 1394 (FireWire) support
++# SCSI Transport Attributes
+ #
++# CONFIG_SCSI_SPI_ATTRS is not set
++# CONFIG_SCSI_FC_ATTRS is not set
++# CONFIG_SCSI_ISCSI_ATTRS is not set
+ 
+ #
+-# I2O device support
++# SCSI low-level drivers
+ #
++# CONFIG_SCSI_SATA is not set
++# CONFIG_SCSI_DEBUG is not set
+ 
+ #
+-# Networking support
++# PCMCIA SCSI adapter support
+ #
+-CONFIG_NET=y
++# 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
+ 
+ #
+-# Networking options
++# Multi-device support (RAID and LVM)
+ #
+-# CONFIG_PACKET is not set
+-# CONFIG_NETLINK_DEV is not set
+-CONFIG_UNIX=y
+-# CONFIG_NET_KEY is not set
+-CONFIG_INET=y
+-# CONFIG_IP_MULTICAST is not set
+-# CONFIG_IP_ADVANCED_ROUTER is not set
+-CONFIG_IP_PNP=y
+-CONFIG_IP_PNP_DHCP=y
+-# CONFIG_IP_PNP_BOOTP is not set
+-# CONFIG_IP_PNP_RARP is not set
+-# CONFIG_NET_IPIP is not set
+-# CONFIG_NET_IPGRE 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_TUNNEL is not set
+-CONFIG_IP_TCPDIAG=y
+-# CONFIG_IP_TCPDIAG_IPV6 is not set
+-# CONFIG_IPV6 is not set
+-# CONFIG_NETFILTER is not set
++# CONFIG_MD is not set
+ 
+ #
+-# SCTP Configuration (EXPERIMENTAL)
++# Fusion MPT device support
+ #
+-# CONFIG_IP_SCTP 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_NET_DIVERT is not set
+-# CONFIG_ECONET is not set
+-# CONFIG_WAN_ROUTER is not set
++# CONFIG_FUSION is not set
+ 
+ #
+-# QoS and/or fair queueing
++# IEEE 1394 (FireWire) support
+ #
+-# CONFIG_NET_SCHED is not set
+-# CONFIG_NET_CLS_ROUTE is not set
+ 
+ #
+-# Network testing
++# I2O device support
++#
++
++#
++# Network device support
+ #
+-# CONFIG_NET_PKTGEN is not set
+-# CONFIG_NETPOLL is not set
+-# CONFIG_NET_POLL_CONTROLLER is not set
+-# CONFIG_HAMRADIO is not set
+-# CONFIG_IRDA is not set
+-# CONFIG_BT is not set
+ CONFIG_NETDEVICES=y
+ # CONFIG_DUMMY is not set
+ # CONFIG_BONDING is not set
+@@ -402,6 +472,7 @@ CONFIG_NETDEVICES=y
+ CONFIG_NET_ETHERNET=y
+ CONFIG_MII=y
+ CONFIG_SMC91X=y
++# CONFIG_DM9000 is not set
+ 
+ #
+ # Ethernet (1000 Mbit)
+@@ -421,6 +492,11 @@ CONFIG_SMC91X=y
+ # CONFIG_NET_RADIO is not set
+ 
+ #
++# PCMCIA network device support
++#
++# CONFIG_NET_PCMCIA is not set
++
++#
+ # Wan interfaces
+ #
+ # CONFIG_WAN is not set
+@@ -428,6 +504,8 @@ CONFIG_SMC91X=y
+ # CONFIG_SLIP is not set
+ # CONFIG_SHAPER is not set
+ # CONFIG_NETCONSOLE is not set
++# CONFIG_NETPOLL is not set
++# CONFIG_NET_POLL_CONTROLLER is not set
+ 
+ #
+ # ISDN subsystem
+@@ -443,7 +521,7 @@ CONFIG_INPUT=y
+ # Userland interfaces
+ #
+ CONFIG_INPUT_MOUSEDEV=y
+-CONFIG_INPUT_MOUSEDEV_PSAUX=y
++# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+ # CONFIG_INPUT_JOYDEV is not set
+@@ -455,11 +533,12 @@ CONFIG_INPUT_EVDEV=y
+ # Input Device Drivers
+ #
+ CONFIG_INPUT_KEYBOARD=y
+-CONFIG_KEYBOARD_ATKBD=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_IDPKBD=y
+ # CONFIG_INPUT_MOUSE is not set
+ # CONFIG_INPUT_JOYSTICK is not set
+ # CONFIG_INPUT_TOUCHSCREEN is not set
+@@ -470,10 +549,8 @@ CONFIG_KEYBOARD_ATKBD=y
+ #
+ CONFIG_SERIO=y
+ # CONFIG_SERIO_SERPORT is not set
+-CONFIG_SERIO_LIBPS2=y
+ # CONFIG_SERIO_RAW is not set
+ # CONFIG_GAMEPORT is not set
+-CONFIG_SOUND_GAMEPORT=y
+ 
+ #
+ # Character devices
+@@ -516,18 +593,28 @@ CONFIG_LEGACY_PTY_COUNT=256
+ #
+ # Ftape, the floppy tape device driver
+ #
+-# CONFIG_DRM is not set
++
++#
++# PCMCIA character devices
++#
++# CONFIG_SYNCLINK_CS is not set
+ # CONFIG_RAW_DRIVER is not set
+ 
+ #
+ # TPM devices
+ #
+-# CONFIG_TCG_TPM is not set
+ 
+ #
+ # I2C support
+ #
+ # CONFIG_I2C is not set
++# CONFIG_I2C_SENSOR is not set
++
++#
++# Hardware Monitoring support
++#
++CONFIG_HWMON=y
++# CONFIG_HWMON_DEBUG_CHIP is not set
+ 
+ #
+ # Misc devices
+@@ -551,10 +638,12 @@ CONFIG_FB_CFB_FILLRECT=y
+ CONFIG_FB_CFB_COPYAREA=y
+ CONFIG_FB_CFB_IMAGEBLIT=y
+ CONFIG_FB_SOFT_CURSOR=y
++# CONFIG_FB_MACMODES is not set
+ # CONFIG_FB_MODE_HELPERS is not set
+ # CONFIG_FB_TILEBLITTING is not set
+ CONFIG_FB_PXA=y
+ # CONFIG_FB_PXA_PARAMETERS is not set
++# CONFIG_FB_S1D13XXX is not set
+ # CONFIG_FB_VIRTUAL is not set
+ 
+ #
+@@ -563,15 +652,9 @@ CONFIG_FB_PXA=y
+ # CONFIG_VGA_CONSOLE is not set
+ CONFIG_DUMMY_CONSOLE=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+-CONFIG_FONTS=y
++# CONFIG_FONTS is not set
+ CONFIG_FONT_8x8=y
+ CONFIG_FONT_8x16=y
+-# CONFIG_FONT_6x11 is not set
+-# CONFIG_FONT_PEARL_8x8 is not set
+-# CONFIG_FONT_ACORN_8x8 is not set
+-# CONFIG_FONT_MINI_4x6 is not set
+-# CONFIG_FONT_SUN8x16 is not set
+-# CONFIG_FONT_SUN12x22 is not set
+ 
+ #
+ # Logo configuration
+@@ -592,7 +675,116 @@ CONFIG_LOGO_LINUX_CLUT224=y
+ #
+ CONFIG_USB_ARCH_HAS_HCD=y
+ # CONFIG_USB_ARCH_HAS_OHCI is not set
+-# CONFIG_USB is not set
++CONFIG_USB=y
++CONFIG_USB_DEBUG=y
++
++#
++# Miscellaneous USB options
++#
++# CONFIG_USB_DEVICEFS is not set
++CONFIG_USB_BANDWIDTH=y
++# CONFIG_USB_DYNAMIC_MINORS 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_BLUETOOTH_TTY is not set
++# 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
++
++#
++# USB Input Devices
++#
++CONFIG_USB_HID=y
++CONFIG_USB_HIDINPUT=y
++# CONFIG_HID_FF is not set
++# CONFIG_USB_HIDDEV 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_MTOUCH is not set
++# CONFIG_USB_ITMTOUCH is not set
++# CONFIG_USB_EGALAX is not set
++# CONFIG_USB_XPAD is not set
++# CONFIG_USB_ATI_REMOTE is not set
++# CONFIG_USB_KEYSPAN_REMOTE is not set
++
++#
++# USB Imaging devices
++#
++# CONFIG_USB_MDC800 is not set
++# CONFIG_USB_MICROTEK is not set
++
++#
++# USB Multimedia devices
++#
++# CONFIG_USB_DABUSB is not set
++
++#
++# Video4Linux support is needed for USB Multimedia device support
++#
++
++#
++# 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 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_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_CYTHERM is not set
++# CONFIG_USB_PHIDGETKIT is not set
++# CONFIG_USB_PHIDGETSERVO is not set
++# CONFIG_USB_IDMOUSE is not set
++# CONFIG_USB_LD is not set
++
++#
++# USB DSL modem support
++#
+ 
+ #
+ # USB Gadget Support
+@@ -602,17 +794,23 @@ CONFIG_USB_ARCH_HAS_HCD=y
+ #
+ # MMC/SD Card support
+ #
+-# CONFIG_MMC is not set
++CONFIG_MMC=y
++CONFIG_MMC_DEBUG=y
++CONFIG_MMC_BLOCK=y
++CONFIG_MMC_PXA=y
++# CONFIG_MMC_WBSD 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 is not set
+ # CONFIG_JBD is not set
+ # CONFIG_REISERFS_FS is not set
+ # CONFIG_JFS_FS is not set
++# CONFIG_FS_POSIX_ACL is not set
+ 
+ #
+ # XFS support
+@@ -620,6 +818,7 @@ CONFIG_EXT2_FS=y
+ # CONFIG_XFS_FS is not set
+ # CONFIG_MINIX_FS is not set
+ # CONFIG_ROMFS_FS is not set
++CONFIG_INOTIFY=y
+ # CONFIG_QUOTA is not set
+ CONFIG_DNOTIFY=y
+ # CONFIG_AUTOFS_FS is not set
+@@ -636,8 +835,9 @@ CONFIG_DNOTIFY=y
+ #
+ CONFIG_FAT_FS=y
+ CONFIG_MSDOS_FS=y
+-# CONFIG_VFAT_FS is not set
++CONFIG_VFAT_FS=y
+ CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+ # CONFIG_NTFS_FS is not set
+ 
+ #
+@@ -645,7 +845,6 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
+ #
+ CONFIG_PROC_FS=y
+ CONFIG_SYSFS=y
+-# CONFIG_DEVFS_FS is not set
+ # CONFIG_DEVPTS_FS_XATTR is not set
+ # CONFIG_TMPFS is not set
+ # CONFIG_HUGETLB_PAGE is not set
+@@ -664,8 +863,7 @@ CONFIG_RAMFS=y
+ # CONFIG_JFFS_FS is not set
+ CONFIG_JFFS2_FS=y
+ CONFIG_JFFS2_FS_DEBUG=0
+-# CONFIG_JFFS2_FS_NAND is not set
+-# CONFIG_JFFS2_FS_NOR_ECC is not set
++CONFIG_JFFS2_FS_WRITEBUFFER=y
+ # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+ CONFIG_JFFS2_ZLIB=y
+ CONFIG_JFFS2_RTIME=y
+@@ -687,6 +885,7 @@ CONFIG_NFS_FS=y
+ # CONFIG_NFSD is not set
+ CONFIG_ROOT_NFS=y
+ CONFIG_LOCKD=y
++CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
+ # CONFIG_RPCSEC_GSS_KRB5 is not set
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
+Index: linux-2.6.19/arch/arm/mach-pxa/Kconfig
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-pxa/Kconfig
++++ linux-2.6.19/arch/arm/mach-pxa/Kconfig
+@@ -21,7 +21,7 @@ config MACH_MAINSTONE
+ 	select IWMMXT
+ 
+ config ARCH_PXA_IDP
+-	bool "Accelent Xscale IDP"
++	bool "DevKitIDP PXA255"
+ 	select PXA25x
+ 
+ config PXA_SHARPSL
+Index: linux-2.6.19/drivers/input/keyboard/idpkbd.c
+===================================================================
+--- /dev/null
++++ linux-2.6.19/drivers/input/keyboard/idpkbd.c
+@@ -0,0 +1,418 @@
++/*
++ * DevKitIDP PXA255 matrix keyboard driver
++ * Copyright (C) 2005 BSQUARE
++ * David Plentovich <davidp@bsquare.com>
++ *
++ * Based on (2.4.x) driver/char/asi_keyboard.c - Cliff Brake
++ */
++
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#include <linux/stddef.h>
++
++#include <linux/input.h>
++#include <linux/module.h>
++#include <linux/init.h>
++
++#include <linux/timer.h>
++#include <linux/sched.h>
++#include <linux/delay.h>
++
++#include <linux/types.h>
++#include <linux/keyboard.h>
++#include <linux/kd.h>
++
++#include <asm/irq.h>
++#include <asm/io.h>
++
++//#include <asm/hardware.h>
++#include <asm/arch/pxa-regs.h>
++#include <asm/arch/idp.h>
++
++MODULE_AUTHOR("David Plentovich <davidp@bsquare.com>");
++MODULE_DESCRIPTION("DevKitIDP PXA255 matrix keyboard driver");
++MODULE_LICENSE("GPL");
++
++
++//NOTE: Platform HW specific settings are defined in include/asm-arm/arch-pxa/idp.h
++
++
++// set to true to use timers to poll keyboard
++#define POLL_KEYBOARD	1
++
++
++// local variables
++
++#define FN_KEY_SCANCODE			4		//scancode returned when Fn key pressed
++#define NUMLOCK_KEY_SCANCODE	10		//scancode returned when NumLock key pressed
++
++// keyboard matrix 14 columns by 7 rows
++static unsigned char idpkbd_keycode[(KEYBD_MATRIX_NUMBER_OUTPUTS * KEYBD_MATRIX_NUMBER_INPUTS)] = { \
++ KEY_LEFTALT, KEY_GRAVE, 0, KEY_LEFTCTRL, 0, KEY_ESC, KEY_1, KEY_2, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_BACKSPACE, \
++ 0, KEY_BACKSLASH, KEY_LEFTSHIFT, 0, 0, KEY_DELETE, 0, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_ENTER, KEY_RIGHTSHIFT, KEY_DOWN, \
++ 0, KEY_TAB, 0, 0, 0, KEY_Q, KEY_W, KEY_E, KEY_R, KEY_O, KEY_P, KEY_LEFTBRACE, 0, KEY_RIGHTBRACE, \
++ 0, KEY_Z, 0, 0, 0, KEY_CAPSLOCK, 0, 0, KEY_K, KEY_L, KEY_SEMICOLON, KEY_APOSTROPHE, 0, KEY_UP, \
++ 0, KEY_A, 0, 0, 0, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_SLASH, 0, KEY_LEFT, \
++ 0, KEY_X, 0, 0, 0, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMMA, KEY_DOT, 0, KEY_SPACE, \
++ 0, 0, 0, 0, 0, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, 0, 0, KEY_RIGHT \
++};
++
++// function key keyboard matrix 14 columns by 7 rows
++//TODO: change Fn key for +/= to be shifted version of KEY_PAUSE (instead of KEY_BACK)
++static unsigned char idpkbd_fn_keycode[(KEYBD_MATRIX_NUMBER_OUTPUTS * KEYBD_MATRIX_NUMBER_INPUTS)] = { \
++ 0, 0, 0, 0, 0, 0, KEY_F1, KEY_F2, KEY_F9, KEY_F10, 0, KEY_BACK, 0, 0, \
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_PAGEDOWN, \
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_PAUSE, 0, KEY_SCROLLLOCK, \
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_PRINT, KEY_SYSRQ, 0, KEY_PAGEUP, \
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_HOME, \
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
++ 0, 0, 0, 0, 0, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, 0, 0, KEY_END \
++};
++
++//NOTE: NUMLOCK and NumKeypad are not supported; keys are already accessable in other ways.
++
++int idpkbd_used = 0;
++int fn_key_active = 0;
++
++static struct input_dev * idpkbd_dev;
++
++static int scaninterval = HZ/60;	//rate to scan keyboard 
++static struct timer_list scan_timer;
++
++
++// Note: these are not hardware dependent masks, they are
++// just simple n-bit masks based on the number of ins and outs
++// All hardware dependent matrix keyboard stuff is in portable.h
++#define KEYBD_MATRIX_INPUT_MASK		((1 << KEYBD_MATRIX_NUMBER_INPUTS)-1)
++#define KEYBD_MATRIX_OUTPUT_MASK	((1 << KEYBD_MATRIX_NUMBER_OUTPUTS)-1)
++
++static __u16 keystate_prev[KEYBD_MATRIX_NUMBER_OUTPUTS];
++static __u16 keystate_test[KEYBD_MATRIX_NUMBER_OUTPUTS];
++static __u16 keystate_cur [KEYBD_MATRIX_NUMBER_OUTPUTS];
++static int keystate_prev_active = 0;	//FALSE;
++static int keystate_stable_ctr = 0;
++
++
++
++/* local function definitions */
++static void setoutput(__u16 columns)
++{
++	#ifdef KEYBD_MATRIX_INVERT_OUTPUT_LOGIC
++		KEYBD_MATRIX_SET_OUTPUTS(~columns);
++	#else
++		KEYBD_MATRIX_SET_OUTPUTS(columns);
++	#endif
++}
++
++static __u16 scaninput(void)
++{
++	__u32 inputs;
++
++	KEYBD_MATRIX_GET_INPUTS(inputs);
++
++	#ifdef KEYBD_MATRIX_INVERT_INPUT_LOGIC
++		return (__u16)(~inputs & KEYBD_MATRIX_INPUT_MASK);
++	#else
++		return (__u16)(inputs & KEYBD_MATRIX_INPUT_MASK);
++	#endif
++}
++
++static int dokeystatetransition(void)
++{
++	unsigned char code;
++	int i, j;
++	__u16 keystate_xor[KEYBD_MATRIX_NUMBER_OUTPUTS];
++	int ret_val = 0;	//FALSE;
++	//int bFoundValidScancode = FALSE;
++	
++	/* iterate over columns */
++	for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++	{
++		if (keystate_cur[i] != 0)
++			ret_val = 1;	//TRUE;
++
++		keystate_xor[i] = keystate_prev[i] ^ keystate_cur[i];
++		if (keystate_xor[i] != 0)
++		{
++			/* at least one matrix switch was changed, set backlight activity detect flag */
++			//vpDriverGlobals->misc.BacklightActivity = 1;
++
++			/* iterate over rows */
++			for (j = 0; j < KEYBD_MATRIX_NUMBER_INPUTS; j++)
++			{
++				if (keystate_xor[i] & (1 << j))
++				{
++					code = (j * KEYBD_MATRIX_NUMBER_OUTPUTS) + i;
++					/* figure out if key is pressed or released and process */
++
++					// support alt keymap for function keys
++					if (code == FN_KEY_SCANCODE)
++					{
++						fn_key_active = (keystate_cur[i] & (1 << j)) ? 1 : 0;
++					}
++					else
++					{
++						if (fn_key_active)
++						{
++//							printk("matrix %i, key %i, up/down %i\n", code, idpkbd_fn_keycode[code], (keystate_cur[i] & (1 << j)) ? 1 : 0);
++							input_report_key(idpkbd_dev, idpkbd_fn_keycode[code], (keystate_cur[i] & (1 << j)) ? 1 : 0);
++						}
++						else
++						{
++//							printk("matrix %i, key %i, up/down %i\n", code, idpkbd_keycode[code], (keystate_cur[i] & (1 << j)) ? 1 : 0);
++							input_report_key(idpkbd_dev, idpkbd_keycode[code], (keystate_cur[i] & (1 << j)) ? 1 : 0);
++						}
++					}
++
++				}
++			}
++			input_sync(idpkbd_dev);
++		}
++		keystate_prev[i] = keystate_cur[i];
++	}
++
++	return ret_val;
++}
++
++
++// handles keyboard keypress
++#if POLL_KEYBOARD
++static void idpkbd_scan_keyboard(unsigned long dummy)
++{
++	__u16 cs;		/* column status */
++	int i;
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++#define SCAN_START	0	/* start of scan state machine */
++#define SCAN_GETSTATE	1	/* get keyboard state */
++#define SCAN_STAB	2	/* wait for key to stabalize */
++
++	/* start of keyboard scanning sequence */
++	/* Always start with an all-column scan */
++	setoutput( KEYBD_MATRIX_OUTPUT_MASK );
++	udelay( KEYBD_MATRIX_SETTLING_TIME_US );
++	cs = scaninput();
++
++//	printk("cs = %x\n", cs);
++//	printk("keystate_stable_ctr = %d\n", keystate_stable_ctr);
++//	printk("keystate_pre_active = %d\n", keystate_prev_active);
++//	printk("\n");
++
++	/* 
++	 * if no keys were down in previous state AND we are
++	 * not in stablizing mode AND the all-column scan
++	 * is 0, then keyboard is idle.
++	 */
++
++	if ((! keystate_prev_active) && (keystate_stable_ctr == 0) && (cs == 0))
++		goto scan_done;
++
++	/* Get the current state of the keyboard */
++	if (cs == 0)
++	{
++		for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++		{
++			keystate_cur[i] = 0;
++		}
++	}
++	else
++	{
++		for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++		{
++			setoutput ( 1 << i );
++			udelay(KEYBD_MATRIX_SETTLING_TIME_US);
++			keystate_cur[i] = scaninput();
++		}
++	}
++
++	/* Handle the stablizing case first */
++	if (keystate_stable_ctr > 0)
++	{
++
++		/* Compare the current state against the test state */
++		cs = 1;
++		for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++		{
++			if (keystate_cur[i] != keystate_test[i])
++			{
++				cs = 0;
++				break;
++			}
++		}
++
++		// Are the states the same ?
++		if (cs)
++		{
++			++ keystate_stable_ctr;
++			if (keystate_stable_ctr == KEYBD_MATRIX_KEYSTATE_DEBOUNCE_CONSTANT)
++			{
++				keystate_prev_active = dokeystatetransition();
++				keystate_stable_ctr = 0;
++			}
++			goto scan_done;
++		}
++		else
++		{
++			keystate_stable_ctr = 0;		// Clear stable counter and fall through to next stage
++		}
++	}
++
++	// Compare the current state against the previous state
++	cs = 1;
++	for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++	{
++		if (keystate_cur[i] != keystate_prev[i])
++		{
++			cs = 0;
++			break;
++		}
++	}
++
++	// If the states are different, begin waiting for stablizing
++	if (! cs)
++	{
++		for (i = 0; i < KEYBD_MATRIX_NUMBER_OUTPUTS; i++)
++		{
++			keystate_test[i] = keystate_cur[i];
++		}
++		keystate_stable_ctr = 1;
++	}
++
++scan_done:
++	// reload timer for next scan
++	mod_timer(&scan_timer, jiffies + scaninterval);
++}
++#else
++static void idpkbd_interrupt(int irq, void *dummy, struct pt_regs *fp)
++{
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++	input_report_key(idpkbd_dev, BTN_0, inb(IDPKBD_PORT) & 1);
++	input_sync(idpkbd_dev);
++}
++#endif
++
++//TODO: Verify Events operation
++// handles keyboard LED and beep events
++int idpkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
++{
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++	if (type == EV_SND && code == SND_BELL) {
++//x		outb(value, IDPKBD_BELL);
++		return 0;
++	}
++
++	if (type == EV_LED) {
++// TODO:
++		return 0;
++	}
++
++	return -1;
++}
++
++static int idpkbd_open(struct input_dev *dev)
++{
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++	if (idpkbd_used++)
++		return 0;
++
++#if POLL_KEYBOARD
++	// start timer to scan matrix keyboard
++	init_timer(&scan_timer);
++	scan_timer.function = idpkbd_scan_keyboard;
++	mod_timer(&scan_timer, jiffies + scaninterval);
++#else	
++	if (request_irq(IDPKBD_IRQ, idpkbd_interrupt, 0, "idpkbd", NULL)) {
++                printk(KERN_ERR "idpkbd.c: Can't allocate irq %d\n", idpkbd_irq);
++                idpkbd_used--;
++                return -EBUSY;
++        }
++#endif
++
++        return 0;
++}
++
++static void idpkbd_close(struct input_dev *dev)
++{
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++	if (!--idpkbd_used) {
++#if POLL_KEYBOARD
++		// stop timer 
++		del_timer(&scan_timer);
++#else
++		free_irq(IDPKBD_IRQ, idpkbd_interrupt);
++#endif
++	}
++}
++
++static int __init idpkbd_init(void)
++{
++	int i;
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++  idpkbd_dev = input_allocate_device();
++
++	// fill in driver information
++	idpkbd_dev->name = "DevKitIDP PXA255 matrix keyboard";
++	idpkbd_dev->phys = "idpkdb/input0";
++//	idpkbd_dev.id.bustype = BUS_MATRIX;
++	idpkbd_dev->id.vendor = 0x0001;
++	idpkbd_dev->id.product = 0x0001;
++	idpkbd_dev->id.version = 0x0100;
++
++	// fill in function pointers
++	idpkbd_dev->open = idpkbd_open;
++	idpkbd_dev->close = idpkbd_close;
++	idpkbd_dev->event = idpkbd_event;
++
++	// setup available keypresses
++	idpkbd_dev->evbit[0] = BIT(EV_KEY);
++//	idpkbd_dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
++	idpkbd_dev->keycode = idpkbd_keycode;
++	idpkbd_dev->keycodesize = sizeof(unsigned char);
++//	idpkbd_dev.keycodemax = ARRAY_SIZE(idpkbd_keycode);
++	idpkbd_dev->keycodemax = ARRAY_SIZE(idpkbd_keycode) + ARRAY_SIZE(idpkbd_fn_keycode);
++
++	for (i = 0; i < (KEYBD_MATRIX_NUMBER_OUTPUTS * KEYBD_MATRIX_NUMBER_INPUTS); i++)
++	{
++		if (idpkbd_keycode[i])
++			set_bit(idpkbd_keycode[i], idpkbd_dev->keybit);
++		if (idpkbd_fn_keycode[i])
++			set_bit(idpkbd_fn_keycode[i], idpkbd_dev->keybit);
++	}
++
++	input_register_device(idpkbd_dev);
++	
++	printk(KERN_INFO "input: %s\n", idpkbd_dev->name);
++	return 0;
++}
++
++static void __exit idpkbd_exit(void)
++{
++//	printk(KERN_INFO "%s:\n", __FUNCTION__);
++
++	input_unregister_device(idpkbd_dev);
++}
++
++module_init(idpkbd_init);
++module_exit(idpkbd_exit);
++
++
+Index: linux-2.6.19/drivers/input/keyboard/Kconfig
+===================================================================
+--- linux-2.6.19.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6.19/drivers/input/keyboard/Kconfig
+@@ -203,4 +203,14 @@ config KEYBOARD_OMAP
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called omap-keypad.
+ 
++config KEYBOARD_IDPKBD
++	tristate "IDP matrix scan keyboard"
++	depends on ARCH_PXA_IDP && INPUT && INPUT_KEYBOARD
++	help
++	  Say Y here if you are running Linux on a DevKitIDP PXA255 and want
++	  to use the attached matrix scan keyboard.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called idpkbd.
++
+ endif
+Index: linux-2.6.19/drivers/input/keyboard/Makefile
+===================================================================
+--- linux-2.6.19.orig/drivers/input/keyboard/Makefile
++++ linux-2.6.19/drivers/input/keyboard/Makefile
+@@ -4,6 +4,7 @@
+ 
+ # Each configuration option enables a list of files.
+ 
++obj-$(CONFIG_KEYBOARD_IDPKBD)		+= idpkbd.o
+ obj-$(CONFIG_KEYBOARD_ATKBD)		+= atkbd.o
+ obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
+ obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o
+Index: linux-2.6.19/drivers/pcmcia/Makefile
+===================================================================
+--- linux-2.6.19.orig/drivers/pcmcia/Makefile
++++ linux-2.6.19/drivers/pcmcia/Makefile
+@@ -68,5 +68,6 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)		+= sa
+ 
+ pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)		+= pxa2xx_lubbock.o sa1111_generic.o
+ pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)		+= pxa2xx_mainstone.o
++pxa2xx_cs-$(CONFIG_ARCH_PXA_IDP)		+= pxa2xx_idp.o
+ pxa2xx_cs-$(CONFIG_PXA_SHARPSL)			+= pxa2xx_sharpsl.o
+ 
+Index: linux-2.6.19/drivers/pcmcia/pxa2xx_idp.c
+===================================================================
+--- /dev/null
++++ linux-2.6.19/drivers/pcmcia/pxa2xx_idp.c
+@@ -0,0 +1,392 @@
++/*
++ * linux/drivers/pcmcia/pxa2xx_idp.c
++ *
++ * DevKitIDP PXA255 PCMCIA specific routines.
++ * Copyright (C) 2005 BSQUARE
++ * David Plentovich <davidp@bsquare.com>
++ *
++ * Based on pxa2xx_mainstone.c - Nicolas Pitre
++ * Based on (2.4.x) driver/pcmcia/pxa/pxa_idp.c - Jeff Sutherland
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/device.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++
++#include <pcmcia/ss.h>
++
++#include <asm/hardware.h>
++#include <asm/irq.h>
++
++#include <asm/arch/pxa-regs.h>
++#include <asm/arch/idp.h>
++
++#include "soc_common.h"
++
++#define IDP_S0_CD_IRQ	PCMCIA_S0_CD_VALID
++#define IDP_S1_CD_IRQ	PCMCIA_S1_CD_VALID
++#define IDP_S0_IRQ	PCMCIA_S0_RDYINT
++#define IDP_S1_IRQ	PCMCIA_S1_RDYINT
++
++static struct pcmcia_irqs irqs[] = {
++	{ 0, IDP_S0_CD_IRQ, "PCMCIA0 CD" },
++	{ 1, IDP_S1_CD_IRQ, "PCMCIA1 CD" },
++};
++
++
++static int idp_pcmcia_hw_init_cnt = 0;
++
++
++static int idp_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
++{
++	printk("%s: socket %i\n", __FUNCTION__, skt->nr);	//dcp
++
++	if (!idp_pcmcia_hw_init_cnt++)
++	{
++	  	/* Set PCMCIA Socket 0 power to standby mode.
++		*  PXA IDP has dedicated CPLD pins for all this stuff :-)
++	   	*/
++		IDP_CPLD_PCCARD_EN = PCC0_ENABLE | PCC1_ENABLE;	//both slots disabled, reset NOT active
++		IDP_CPLD_PCCARD_PWR = 0; //all power to both slots off
++	
++		/*
++		 * Setup default state of GPIO outputs
++		 * before we enable them as outputs.
++		 */
++		GPSR(GPIO48_nPOE) =
++			GPIO_bit(GPIO48_nPOE) |
++			GPIO_bit(GPIO49_nPWE) |
++			GPIO_bit(GPIO50_nPIOR) |
++			GPIO_bit(GPIO51_nPIOW) |
++			GPIO_bit(GPIO52_nPCE_1) |
++			GPIO_bit(GPIO53_nPCE_2);
++
++		pxa_gpio_mode(GPIO48_nPOE_MD);
++		pxa_gpio_mode(GPIO49_nPWE_MD);
++		pxa_gpio_mode(GPIO50_nPIOR_MD);
++		pxa_gpio_mode(GPIO51_nPIOW_MD);
++		pxa_gpio_mode(GPIO52_nPCE_1_MD);
++		pxa_gpio_mode(GPIO53_nPCE_2_MD);
++		pxa_gpio_mode(GPIO54_pSKTSEL_MD);
++		pxa_gpio_mode(GPIO55_nPREG_MD);
++		pxa_gpio_mode(GPIO56_nPWAIT_MD);
++		pxa_gpio_mode(GPIO57_nIOIS16_MD);
++
++#if 0	//x	
++		GPDR(IRQ_TO_GPIO_2_80(PCMCIA_S0_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO_2_80(PCMCIA_S0_CD_VALID));
++		GPDR(IRQ_TO_GPIO_2_80(PCMCIA_S1_CD_VALID)) &= ~GPIO_bit(IRQ_TO_GPIO_2_80(PCMCIA_S1_CD_VALID));
++
++		set_GPIO_IRQ_edge(IRQ_TO_GPIO_2_80(PCMCIA_S0_CD_VALID), GPIO_BOTH_EDGES);
++		set_GPIO_IRQ_edge(IRQ_TO_GPIO_2_80(PCMCIA_S1_CD_VALID), GPIO_BOTH_EDGES);
++
++		//irq's for slots:
++		GPDR(IRQ_TO_GPIO_2_80(PCMCIA_S0_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO_2_80(PCMCIA_S0_RDYINT));
++		GPDR(IRQ_TO_GPIO_2_80(PCMCIA_S1_RDYINT)) &= ~GPIO_bit(IRQ_TO_GPIO_2_80(PCMCIA_S1_RDYINT));
++
++		set_GPIO_IRQ_edge(IRQ_TO_GPIO_2_80(PCMCIA_S0_RDYINT), GPIO_FALLING_EDGE);
++		set_GPIO_IRQ_edge(IRQ_TO_GPIO_2_80(PCMCIA_S1_RDYINT), GPIO_FALLING_EDGE);
++#endif	//x
++	}
++
++#if 0	//x
++	return_val = request_irq(PCMCIA_S0_CD_VALID, init->handler, SA_INTERRUPT, "PXA PCMCIA CD0", NULL);
++
++	if (return_val < 0)
++		return -1;
++	
++	return_val += request_irq(PCMCIA_S1_CD_VALID, init->handler, SA_INTERRUPT, "PXA PCMCIA CD1", NULL);
++	
++	if (return_val < 0) {
++		free_irq(PCMCIA_S0_CD_VALID, NULL);
++		return -1;
++	}
++
++	return 2;
++
++#endif	//x
++	skt->irq = (skt->nr == 0) ? IDP_S0_IRQ : IDP_S1_IRQ;
++	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
++}
++
++static void idp_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
++{
++//x	free_irq(PCMCIA_S0_CD_VALID, NULL);
++//x	free_irq(PCMCIA_S1_CD_VALID, NULL);
++
++	printk("%s: socket %i\n", __FUNCTION__, skt->nr);	//dcp
++
++	soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
++
++	if (!--idp_pcmcia_hw_init_cnt)
++	{
++		IDP_CPLD_PCCARD_EN = 0x03;	//disable slots
++		udelay(200);
++		IDP_CPLD_PCCARD_PWR = 0; //shut off all power
++	}
++}
++
++//x static unsigned long idp_pcmcia_status[2];
++
++static void idp_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
++				    struct pcmcia_state *state)
++{
++	unsigned long status;
++	volatile unsigned long *stat_regs[2] = { &IDP_CPLD_PCCARD0_STATUS, &IDP_CPLD_PCCARD1_STATUS };
++//	printk("%s: socket %i\n", __FUNCTION__, skt->nr);	//dcp
++
++//x	status = (skt->nr == 0) ? IDP_PCMCIA0 : IDP_PCMCIA1;
++	status = *stat_regs[skt->nr];
++//x	flip = (status ^ idp_pcmcia_status[skt->nr]) & IDP_PCMCiIA_nSTSCHG_BVD1;
++
++#if 0	//x
++	/*
++	 * Workaround for STSCHG which can't be deasserted:
++	 * We therefore disable/enable corresponding IRQs
++	 * as needed to avoid IRQ locks.
++	 */
++	if (flip) {
++		idp_pcmcia_status[skt->nr] = status;
++		if (status & IDP_PCMCIA_nSTSCHG_BVD1)
++			enable_irq( (skt->nr == 0) ? IDP_S0_STSCHG_IRQ
++						   : IDP_S1_STSCHG_IRQ );
++		else
++			disable_irq( (skt->nr == 0) ? IDP_S0_STSCHG_IRQ
++						    : IDP_S1_STSCHG_IRQ );
++	}
++#endif	//x
++
++//x	state->detect = (status & IDP_PCMCIA_nCD) ? 0 : 1;
++	state->detect = (PCC_DETECT(skt->nr)) ? 0 : 1;		// this one is gpio
++	state->ready  = (status & _PCC_IRQ) ? 1 : 0;
++	state->bvd1   = (status & PCC_BVD1) ? 1 : 0;
++	state->bvd2   = (status & PCC_BVD2) ? 1 : 0;
++	state->wrprot = (status & _PCC_WRPROT) ? 1 : 0;
++	state->vs_3v  = (status & PCC_VS1) ? 0 : 1;
++	state->vs_Xv  = (status & PCC_VS2) ? 0 : 1;
++
++#if 0	
++		printk("%s: Sock %u flags: %s%s%s%s%s%s%s\n",__FUNCTION__,skt->nr,
++				(state->detect) ? "DET " : "",
++				(state->ready) ? "RDY " : "",
++				(state->bvd1) ? "BVD1 " : "",
++				(state->bvd2) ? "BVD2 " : "",
++				(state->wrprot) ? "WRPROT " : "",
++				(state->vs_3v) ? "VS_3V " : "",
++				(state->vs_Xv) ? "VS_XV " : "");
++#endif
++}
++
++static int idp_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
++				       const socket_state_t *state)
++{
++  /* The PXA Idp uses the Maxim MAX1602, with the following connections:
++   *
++   * Socket 0 (PCMCIA):
++   *	MAX1602	PXA_IDP		Register
++   *	Pin	Signal  	IDP_CPLD_PCCARD_PWR:
++   *	-----	-------		----------------------
++   *	A0VPP	PCC0_PWR0	bit0
++   *	A1VPP	PCC0_PWR1	bit1	
++   *	A0VCC	PCC0_PWR2	bit2
++   *	A1VCC	PCC0_PWR3	bit3
++   *	VX	VCC
++   *	VY	+3.3V
++   *	12IN	+12V
++   *	CODE	+3.3V		Cirrus  Code, CODE = High (VY)
++   *
++   * Socket 1 (PCMCIA):
++   *	MAX1602	PXA_IDP		Register
++   *	Pin	Signal		IDP_CPLD_PCCARD_PWR:
++   *	-----	-------		----------------------
++   *	A0VPP	PCC1_PWR0	bit4
++   *	A1VPP	PCC1_PWR1	bit5
++   *	A0VCC	PCC1_PWR2	bit6
++   *	A1VCC	PCC1_PWR3	bit7
++   *	VX	VCC
++   *	VY	+3.3V
++   *	12IN	+12V		
++   *	CODE	+3.3V		Cirrus  Code, CODE = High (VY)
++   *
++   */
++
++	printk("%s: socket %i %i %i\n", __FUNCTION__, skt->nr, state->Vcc, state->Vpp);	//dcp
++
++	switch (skt->nr) {
++		case 0:
++			switch (state->Vcc) {
++			    case 0:
++					IDP_CPLD_PCCARD_EN |= PCC0_ENABLE; // disable socket
++					udelay(200);
++					IDP_CPLD_PCCARD_PWR &= ~(PCC0_PWR2 | PCC0_PWR3);
++					break;
++
++			    case 33:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC0_PWR2 | PCC0_PWR3);
++					IDP_CPLD_PCCARD_PWR |= PCC0_PWR3;
++					IDP_CPLD_PCCARD_EN &= ~PCC0_ENABLE; //turn it on
++					break;
++
++			    case 50:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC0_PWR2 | PCC0_PWR3);
++					IDP_CPLD_PCCARD_PWR |= PCC0_PWR2;
++					IDP_CPLD_PCCARD_EN &= ~PCC0_ENABLE;
++					break;
++
++			    default:
++			 		printk(KERN_ERR "%s(): bad Vcc %u\n", __FUNCTION__, state->Vcc);
++					return -1;
++			}
++
++			switch (state->Vpp) {
++			    case 0:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC0_PWR0 | PCC0_PWR1);
++					break;
++
++			    case 120:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC0_PWR0 | PCC0_PWR1);
++					IDP_CPLD_PCCARD_PWR |= PCC0_PWR1;
++					break;
++
++			    default:
++				  	if(state->Vpp == state->Vcc) {
++						IDP_CPLD_PCCARD_PWR = (IDP_CPLD_PCCARD_PWR & ~(PCC0_PWR0 | PCC0_PWR1)) | PCC0_PWR0;
++					}
++					else {
++						printk(KERN_ERR "%s(): bad Vpp %u\n", __FUNCTION__, state->Vpp);
++						return -1;
++					}
++			}
++	
++			if (state->flags & SS_RESET) {
++				IDP_CPLD_PCCARD_EN = (IDP_CPLD_PCCARD_EN | PCC0_RESET);
++				printk("RESET\n");
++				}
++			else
++				IDP_CPLD_PCCARD_EN = (IDP_CPLD_PCCARD_EN & ~PCC0_RESET);
++
++	    	break;
++
++		case 1:
++			switch (state->Vcc) {
++		    	case 0:
++					IDP_CPLD_PCCARD_EN |= PCC1_ENABLE; // disable socket
++					udelay(200);
++					IDP_CPLD_PCCARD_PWR &= ~(PCC1_PWR2 | PCC1_PWR3);
++					break;
++
++			    case 33:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC1_PWR2 | PCC1_PWR3);
++					IDP_CPLD_PCCARD_PWR |= PCC1_PWR3;
++					IDP_CPLD_PCCARD_EN &= ~PCC1_ENABLE; //turn it on
++					break;
++
++			    case 50:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC1_PWR2 | PCC1_PWR3);
++					IDP_CPLD_PCCARD_PWR |= PCC1_PWR2;
++					IDP_CPLD_PCCARD_EN &= ~PCC1_ENABLE;
++					break;
++
++			    default:
++				 	printk(KERN_ERR "%s(): bad Vcc %u\n", __FUNCTION__, state->Vcc);
++					return -1;
++			}
++
++			switch (state->Vpp) {
++			    case 0:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC1_PWR0 | PCC1_PWR1);
++				break;
++
++			    case 120:
++					IDP_CPLD_PCCARD_PWR &= ~(PCC1_PWR0 | PCC1_PWR1);
++					IDP_CPLD_PCCARD_PWR |= PCC1_PWR1;
++					break;
++
++			    default:
++			  		if(state->Vpp == state->Vcc) {
++						IDP_CPLD_PCCARD_PWR = (IDP_CPLD_PCCARD_PWR & ~(PCC1_PWR0 | PCC1_PWR1)) | PCC1_PWR0;
++					}
++					else {
++				  		printk(KERN_ERR "%s(): bad Vpp %u\n", __FUNCTION__, state->Vpp);
++						return -1;
++					}
++			}
++		
++			if (state->flags & SS_RESET) {
++				IDP_CPLD_PCCARD_EN = (IDP_CPLD_PCCARD_EN | PCC1_RESET);
++				printk("RESET\n");
++				}
++			else
++				IDP_CPLD_PCCARD_EN = (IDP_CPLD_PCCARD_EN & ~PCC1_RESET);
++
++		    break;
++	}
++	return 0;
++}
++
++static void idp_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
++{
++	printk("%s: socket %i\n", __FUNCTION__, skt->nr);	//dcp
++}
++
++static void idp_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
++{
++	printk("%s: socket %i\n", __FUNCTION__, skt->nr);	//dcp
++}
++
++static struct pcmcia_low_level idp_pcmcia_ops = {
++	.owner			= THIS_MODULE,
++	.hw_init		= idp_pcmcia_hw_init,
++	.hw_shutdown		= idp_pcmcia_hw_shutdown,
++	.socket_state		= idp_pcmcia_socket_state,
++	.configure_socket	= idp_pcmcia_configure_socket,
++	.socket_init		= idp_pcmcia_socket_init,
++	.socket_suspend		= idp_pcmcia_socket_suspend,
++	.nr			= 2,
++};
++
++static struct platform_device *idp_pcmcia_device;
++
++static int __init idp_pcmcia_init(void)
++{
++	int ret;
++	printk("%s\n", __FUNCTION__);	//dcp
++
++	idp_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
++	if (!idp_pcmcia_device)
++		return -ENOMEM;
++	memset(idp_pcmcia_device, 0, sizeof(*idp_pcmcia_device));
++	idp_pcmcia_device->name = "pxa2xx-pcmcia";
++	idp_pcmcia_device->dev.platform_data = &idp_pcmcia_ops;
++
++	ret = platform_device_register(idp_pcmcia_device);
++	if (ret)
++		kfree(idp_pcmcia_device);
++
++	return ret;
++}
++
++static void __exit idp_pcmcia_exit(void)
++{
++	printk("%s\n", __FUNCTION__);	//dcp
++	/*
++	 * This call is supposed to free our idp_pcmcia_device.
++	 * Unfortunately platform_device don't have a free method, and
++	 * we can't assume it's free of any reference at this point so we
++	 * can't free it either.
++	 */
++	platform_device_unregister(idp_pcmcia_device);
++}
++
++module_init(idp_pcmcia_init);
++module_exit(idp_pcmcia_exit);
++
++MODULE_LICENSE("GPL");
+Index: linux-2.6.19/include/asm-arm/arch-pxa/idp.h
+===================================================================
+--- linux-2.6.19.orig/include/asm-arm/arch-pxa/idp.h
++++ linux-2.6.19/include/asm-arm/arch-pxa/idp.h
+@@ -179,15 +179,15 @@
+ #define KEYBD_MATRIX_NUMBER_INPUTS	7
+ #define KEYBD_MATRIX_NUMBER_OUTPUTS	14
+ 
+-#define KEYBD_MATRIX_INVERT_OUTPUT_LOGIC	FALSE
+-#define KEYBD_MATRIX_INVERT_INPUT_LOGIC		FALSE
++#undef KEYBD_MATRIX_INVERT_OUTPUT_LOGIC
++#undef KEYBD_MATRIX_INVERT_INPUT_LOGIC
+ 
+-#define KEYBD_MATRIX_SETTLING_TIME_US			100
++#define KEYBD_MATRIX_SETTLING_TIME_US			40
+ #define KEYBD_MATRIX_KEYSTATE_DEBOUNCE_CONSTANT		2
+ 
+ #define KEYBD_MATRIX_SET_OUTPUTS(outputs) \
+ {\
+-	IDP_CPLD_KB_COL_LOW = outputs;\
++	IDP_CPLD_KB_COL_LOW = outputs & 0x7f;\
+ 	IDP_CPLD_KB_COL_HIGH = outputs >> 7;\
+ }
+ 
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255_2.6.19.bb
index a79c90220c..500c0535d2 100644
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255_2.6.19.bb
@@ -1,16 +1,15 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r4"
+DEPENDS = "u-boot"
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11-rc4_idp.patch;patch=1 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11_idp_leds.patch;patch=1 \
-	   ftp://ftp.accelent.com/pxa255_idp/linux/devkitidp-pxa255_defconfig"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
+	   file://linux-2.6.19_devkitidp1.patch;patch=1 \
+	   file://defconfig"
 
-S = "${WORKDIR}/linux-2.6.11"
+S = "${WORKDIR}/linux-2.6.19"
 
-COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "devkitidp-pxa255"
 
 inherit kernel
@@ -26,13 +25,13 @@ KERNEL_IMAGETYPE = "uImage"
 CMDLINE = "root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mtdparts=phys_mapped_flash:256k(boot)ro,0x1C0000(kernel),-(root)"
 
 do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
+	install -m 0644 ${WORKDIR}/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
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 2e49e912f5..a45a690955 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -177,9 +177,6 @@ EXTRA_OEMAKE += "EXTRAVERSION="
 EXTRA_OEMAKE += "LOCALVERSION="
 EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'"
 
-# Override KERNEL_RELEASE from kernel.bbclass to match:
-KERNEL_RELEASE = "${KERNEL_VERSION}"
-
 # Set the correct CONFIG_CPU_xxx_ENDIAN and CONFIG_CMDLINE at the head
 # of the .config file and remove any settings in defconfig then append
 # defconfig to .config
@@ -238,7 +235,7 @@ do_configure_prepend() {
 # The generic package only includes the generic image, the other
 # packages are made below (they are kernel-image packages but
 # with a different ARCH).
-FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_RELEASE}"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_VERSION}"
 
 # MACHINE DEFINITIONS: one block for each machine
 
@@ -248,12 +245,12 @@ PACKAGES += "kernel-image-nslu2"
 PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2"
-FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nslu2 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nslu2 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for Loft:
@@ -262,12 +259,12 @@ PACKAGES += "kernel-image-loft"
 PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-loft = "loft${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board"
-FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-loft () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-loft () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the NAS100D board:
@@ -276,12 +273,12 @@ PACKAGES += "kernel-image-nas100d"
 PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-nas100d = "nas100d${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D"
-FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nas100d () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nas100d () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the DSMG600 board:
@@ -290,12 +287,12 @@ PACKAGES += "kernel-image-dsmg600"
 PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600"
-FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-dsmg600 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-dsmg600 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the FSG-3 board:
@@ -304,12 +301,12 @@ PACKAGES += "kernel-image-fsg3"
 PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3"
-FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-fsg3 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-fsg3 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 #FIXUP: the correct instructions to copy the kernel prepended with the le fixup
@@ -346,13 +343,13 @@ copy_image() {
 }
 
 install_image() {
-	copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2"
+	copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_VERSION}' "$2"
 }
 
 do_install_append() {
 	# Overwrite the unshimmed generic image with a shimmed one (but without
 	# any command line or machine id override).
-	rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}'
+	rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERISON}'
 	install_image '${IXP4XX_SUFFIX}'
 
 	# Add the machine specific images, with appropriate suffixes
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 0f4863e125..5d13af9f83 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -103,7 +103,7 @@ do_compile_append() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 7a15cbe315..35dd7fbb58 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -61,6 +61,11 @@ do_configure() {
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+
+	#reflash.ctl is required to reflash using bootldr
+	# format:
+	# name file md5sumfile destination
+	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
 }   
    
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index 7fc274351a..10b3d2edac 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -20,7 +20,6 @@ KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_RELEASE = "2.6.19-rc6"
 
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap1.inc
index 8e64156d4c..8e78ac1a5c 100644
--- a/packages/linux/linux-omap1.inc
+++ b/packages/linux/linux-omap1.inc
@@ -26,7 +26,7 @@ do_deploy() {
                 install -d ${DEPLOY_DIR_IMAGE}
                 ${OBJCOPY} -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${S}/linux.bin
                 gzip -f -9 ${S}/linux.bin
-                mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}-${MACHINE}-${DATETIME}.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}-${MACHINE}-${DATETIME}.bin
                 rm ${S}/linux.bin.gz
         fi
 }
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 74d6822ff4..1b9a1b6de0 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -7,5 +7,3 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.ta
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc2"
-
-KERNEL_RELEASE = "2.6.12-rc2-omap1"
diff --git a/packages/linux/linux-omap1_2.6.18+git.bb b/packages/linux/linux-omap1_2.6.18+git.bb
index b4f368bf66..a097caa113 100644
--- a/packages/linux/linux-omap1_2.6.18+git.bb
+++ b/packages/linux/linux-omap1_2.6.18+git.bb
@@ -7,5 +7,3 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=http;tag=c605
            file://defconfig"
 
 S = "${WORKDIR}/git"
-
-KERNEL_RELEASE = "2.6.18-omap1"
diff --git a/packages/linux/linux-omap1_2.6.18-omap1.bb b/packages/linux/linux-omap1_2.6.18-omap1.bb
index bc1510b4a7..7c087e8cba 100644
--- a/packages/linux/linux-omap1_2.6.18-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.18-omap1.bb
@@ -7,5 +7,3 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
 	   file://defconfig.eabi"
 
 S = "${WORKDIR}/linux-2.6.18"
-
-KERNEL_RELEASE = "${PV}"
diff --git a/packages/linux/linux-omap1_2.6.19-omap1.bb b/packages/linux/linux-omap1_2.6.19-omap1.bb
index cfe0723770..1734149180 100644
--- a/packages/linux/linux-omap1_2.6.19-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.19-omap1.bb
@@ -8,5 +8,3 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
 	   file://defconfig.eabi"
 
 S = "${WORKDIR}/linux-2.6.19"
-
-KERNEL_RELEASE = "${PV}"
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
index dc039b98b2..fbc0ee2ce7 100644
--- a/packages/linux/linux-omap1_2.6.x+git.bb
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -8,5 +8,3 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=http \
            file://defconfig"
 
 S = "${WORKDIR}/git"
-
-KERNEL_RELEASE = "2.6.18-omap1"
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index a9d7fcb07f..63342d5b3f 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -194,7 +194,7 @@ do_deploy() {
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
 	rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
 	ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib	
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib	
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-rp_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb
index f1de99d452..bd1ce2b210 100644
--- a/packages/linux/linux-rp_2.6.16.bb
+++ b/packages/linux/linux-rp_2.6.16.bb
@@ -154,6 +154,3 @@ SRC_URI_append_poodle = "\
 	   ${RPSRC}/rp_poodle_hacks-r0.patch;patch=1"
 
 S = "${WORKDIR}/linux-2.6.16"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.16"
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index fceb547e16..e16bc5d342 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -123,6 +123,3 @@ SRC_URI_append_tosa = "\
 #	   ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.17"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.17"
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index a4d7813f53..7150881cad 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -105,6 +105,3 @@ SRC_URI_append_tosa = "\
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.18"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.18"
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index c0d742fffd..1c88dcc204 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -106,6 +106,3 @@ SRC_URI_append_tosa = "\
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/git"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.19-rc4"
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index 41212f3c92..4bb25d4ecc 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -105,6 +105,3 @@ SRC_URI_append_tosa = "\
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.19"
-
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.19"
diff --git a/packages/linux/linux-smdk2440_2.6.19.bb b/packages/linux/linux-smdk2440_2.6.19.bb
index 039e412919..6b839bddf8 100644
--- a/packages/linux/linux-smdk2440_2.6.19.bb
+++ b/packages/linux/linux-smdk2440_2.6.19.bb
@@ -30,7 +30,7 @@ do_deploy() {
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
         rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
         ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-titan-sh4_2.6.17.bb b/packages/linux/linux-titan-sh4_2.6.17.bb
index 55e55929a5..5069510bfe 100644
--- a/packages/linux/linux-titan-sh4_2.6.17.bb
+++ b/packages/linux/linux-titan-sh4_2.6.17.bb
@@ -19,9 +19,6 @@ ARCH = "sh"
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
 
-# Fix up kernel version - sh kernels get -sh added automatically
-KERNEL_RELEASE = "${KERNEL_VERSION}"
-
 #
 # The linux-sh cvs tree is a "drop in source tree" and needs to be copied
 # over the top of the normal linux source since it only includes modified
diff --git a/packages/linux/linux/progear/defconfig b/packages/linux/linux/progear/defconfig
index 4b811dbc4b..1dccddab5e 100644
--- a/packages/linux/linux/progear/defconfig
+++ b/packages/linux/linux/progear/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18
-# Sun Nov 26 20:58:25 2006
+# Linux kernel version: 2.6.19
+# Sat Jan  6 17:55:01 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -32,19 +32,22 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 # CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 CONFIG_AUDIT=y
 # CONFIG_AUDITSYSCALL is not set
 # CONFIG_IKCONFIG is not set
 # 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=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -75,6 +78,7 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
@@ -177,6 +181,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -205,6 +210,7 @@ CONFIG_PHYSICAL_START=0x100000
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
 # CONFIG_SOFTWARE_SUSPEND is not set
 
 #
@@ -220,32 +226,25 @@ CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_IBM is not set
 # CONFIG_ACPI_TOSHIBA is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 # CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_SBS=m
 
 #
 # APM (Advanced Power Management) BIOS Support
 #
-CONFIG_APM=m
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
+# CONFIG_APM is not set
 
 #
 # CPU Frequency scaling
@@ -297,6 +296,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_MSI is not set
+CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
@@ -349,6 +349,9 @@ CONFIG_NET=y
 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
@@ -367,9 +370,11 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
@@ -555,15 +560,88 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_ATA_OVER_ETH is not set
 
 #
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_MSI_LAPTOP is not set
+
+#
 # ATA/ATAPI/MFM/RLL support
 #
-# CONFIG_IDE is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECS is not set
+# 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_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+CONFIG_BLK_DEV_ALI15X3=y
+# CONFIG_WDC_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# 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 is not set
 
 #
@@ -585,12 +663,13 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_LOGGING is not set
 
 #
-# SCSI Transport Attributes
+# 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
@@ -603,12 +682,13 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -618,10 +698,11 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
@@ -638,6 +719,11 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_PCMCIA_SYM53C500 is not set
 
 #
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
@@ -714,6 +800,7 @@ CONFIG_R8169_NAPI=y
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -821,6 +908,7 @@ CONFIG_PCMCIA_PCNET=m
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
@@ -845,6 +933,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
@@ -855,6 +944,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ELO is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 # CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=y
 # CONFIG_INPUT_WISTRON_BTNS is not set
@@ -1019,6 +1111,7 @@ CONFIG_I2C_ALI15X3=m
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -1031,6 +1124,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
@@ -1057,6 +1151,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
@@ -1068,15 +1163,9 @@ CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Misc devices
-#
-# CONFIG_IBM_ASM is not set
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -1088,20 +1177,66 @@ CONFIG_VIDEO_V4L2=y
 # Graphics support
 #
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB is not set
+CONFIG_FB=y
+# CONFIG_FB_DDC is not set
+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=y
+CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_VESA_STD is not set
+CONFIG_FB_VESA_TNG=y
+CONFIG_FB_VESA_DEFAULT_MODE="1024x768@60"
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_VIRTUAL is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VIDEO_SELECT=y
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=y
 
 #
 # Sound
@@ -1198,6 +1333,7 @@ CONFIG_SND_ALI5451=m
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 
 #
 # USB devices
@@ -1262,12 +1398,14 @@ 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
 
 #
@@ -1304,12 +1442,14 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET_MII=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
 # CONFIG_USB_NET_RNDIS_HOST is not set
 CONFIG_USB_NET_CDC_SUBSET=m
 # CONFIG_USB_ALI_M5632 is not set
@@ -1334,6 +1474,7 @@ CONFIG_USB_NET_ZAURUS=m
 #
 # 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
@@ -1341,11 +1482,12 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO 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
 
 #
@@ -1392,6 +1534,7 @@ 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
@@ -1442,6 +1585,7 @@ CONFIG_EXT3_FS=y
 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=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1458,6 +1602,7 @@ CONFIG_XFS_FS=m
 # CONFIG_XFS_SECURITY is not set
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT 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
@@ -1496,8 +1641,10 @@ CONFIG_NTFS_FS=m
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
@@ -1598,6 +1745,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_KERNEL is not set
@@ -1605,6 +1753,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
@@ -1620,18 +1769,25 @@ CONFIG_DOUBLEFAULT=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_HMAC is not set
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# CONFIG_CRYPTO_TWOFISH_586 is not set
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_AES_586=m
@@ -1642,6 +1798,7 @@ CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_LZF is not set
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_TEST=m
@@ -1659,6 +1816,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_AUDIT_GENERIC=y
+CONFIG_DYN_PAGEFLAGS=y
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
diff --git a/packages/linux/linux_2.6.19-rc6.bb b/packages/linux/linux_2.6.19-rc6.bb
deleted file mode 100644
index 59186ef579..0000000000
--- a/packages/linux/linux_2.6.19-rc6.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPL"
-PV = "2.6.18+2.6.19-rc6"
-PR = "r1"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc1.bz2;patch=1 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc1-rc2.bz2;patch=1 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc2-rc3.bz2;patch=1 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc3-rc4.bz2;patch=1 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc4-rc5.bz2;patch=1 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc5-rc6.bz2;patch=1 \
-           file://defconfig"
-
-S = "${WORKDIR}/linux-2.6.18"
-
-inherit kernel
-
-KERNEL_IMAGETYPE = "bzImage"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-}
-
-KERNEL_RELEASE = "2.6.19-rc6"
diff --git a/packages/linux/linux_2.6.19.bb b/packages/linux/linux_2.6.19.bb
new file mode 100644
index 0000000000..8e9346c473
--- /dev/null
+++ b/packages/linux/linux_2.6.19.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPL"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
+           file://defconfig"
+
+SRC_URI_append_progear = " \
+           file://progear_bl-r5.patch;patch=1 \
+	   "
+
+S = "${WORKDIR}/linux-2.6.19"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "bzImage"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+}
diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
index 09dc45f3bd..f218904c43 100644
--- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -22,10 +22,6 @@ ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
 RPROVIDES_kernel-image += "hostap-modules"
 
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.19-rc6"
-
-
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
 #CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
index c6f76fee6f..2081693d68 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -22,10 +22,6 @@ ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
 RPROVIDES_kernel-image += "hostap-modules"
 
-# to get module dependencies working
-KERNEL_RELEASE = "2.6.19-rc6"
-
-
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
 #CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index e5ed21f0a1..129d5e4403 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -178,9 +178,6 @@ EXTRA_OEMAKE += "EXTRAVERSION="
 EXTRA_OEMAKE += "LOCALVERSION="
 EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'"
 
-# Override KERNEL_RELEASE from kernel.bbclass to match:
-KERNEL_RELEASE = "${KERNEL_VERSION}"
-
 addtask unpacklocal before do_patch after do_unpack
 
 # NOTE: in MM kernel builds the config options (oldconfig, menuconfig
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
index 219a467b69..a82e0abd3e 100644
--- a/packages/linux/xanadux-un-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -23,7 +23,7 @@ do_configure() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index b3ea1beb77..6fc626399d 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -32,7 +32,7 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-utils-nodbus \
+	bluez-utils \
 	bridge-utils \
 	bzip2 \
 	ccxstream \
@@ -198,7 +198,8 @@ SLUGOS_BROKEN_PACKAGES = "\
 # calls often still have 'yp' in the name).
 
 # NOTE: rng-tools is only here until argp-standalone can be built!
-	nfs-utils \
+#	nfs-utils \
+
 UCLIBC_UNSUPPORTABLE_PACKAGES = "\
 	libpam \
 	rng-tools \
@@ -207,11 +208,12 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
 	"
 
 # These packages work with glibc, but break on uclibc.
+#	erlang \
+
 UCLIBC_BROKEN_PACKAGES = "\
 	apr \
 	bogofilter \
 	boost \
-	erlang \
 	linphone \
 	sudo \
 	ushare \
diff --git a/packages/mp3blaster/mp3blaster-3.2.3/.mtn2git_empty b/packages/mp3blaster/mp3blaster-3.2.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mp3blaster/mp3blaster-3.2.3/.mtn2git_empty
diff --git a/packages/mp3blaster/mp3blaster-3.2.3/includedir.patch b/packages/mp3blaster/mp3blaster-3.2.3/includedir.patch
new file mode 100644
index 0000000000..f37dc0b54e
--- /dev/null
+++ b/packages/mp3blaster/mp3blaster-3.2.3/includedir.patch
@@ -0,0 +1,37 @@
+Index: mp3blaster-3.2.3/mpegsound/Makefile.am
+===================================================================
+--- mp3blaster-3.2.3.orig/mpegsound/Makefile.am	2007-01-07 02:32:21.000000000 +0100
++++ mp3blaster-3.2.3/mpegsound/Makefile.am	2007-01-07 02:32:31.000000000 +0100
+@@ -12,5 +12,5 @@
+ 
+ noinst_HEADERS		= mpegsound.h mpegsound_locals.h
+ 
+-INCLUDES                = -I$(srcdir) -I$(includedir)
++INCLUDES                = -I$(srcdir)
+ AM_CXXFLAGS             = @NAS_CFLAGS@
+Index: mp3blaster-3.2.3/nmixer/Makefile.am
+===================================================================
+--- mp3blaster-3.2.3.orig/nmixer/Makefile.am	2007-01-07 02:32:22.000000000 +0100
++++ mp3blaster-3.2.3/nmixer/Makefile.am	2007-01-07 02:32:36.000000000 +0100
+@@ -2,7 +2,7 @@
+ nmixer_SOURCES	= main.cc
+ nmixer_DEPENDENCIES = libnmixer.a
+ LDADD           = @NCURSES_LIBS@ @NAS_LIBS@ @LIBNMIXER@
+-INCLUDES		= -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
++INCLUDES		= -I$(srcdir)
+ noinst_LIBRARIES = libnmixer.a
+ libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
+                       getopt.c getopt1.c getopt_local.h nullmixer.cc
+Index: mp3blaster-3.2.3/src/Makefile.am
+===================================================================
+--- mp3blaster-3.2.3.orig/src/Makefile.am	2007-01-07 02:32:22.000000000 +0100
++++ mp3blaster-3.2.3/src/Makefile.am	2007-01-07 02:32:49.000000000 +0100
+@@ -35,7 +35,7 @@
+ mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+ mp3tag_LDADD = @LIBMPEGSOUND@ @LIBESD@ @LIBSDL@
+ mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+-INCLUDES		= -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
++INCLUDES		= -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
+ mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@ @LIBESD@ @LIBSDL@
+ EXTRA_DIST = FILES
+ AM_CXXFLAGS	= @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
diff --git a/packages/mp3blaster/mp3blaster_3.2.3.bb b/packages/mp3blaster/mp3blaster_3.2.3.bb
new file mode 100644
index 0000000000..c766c459ea
--- /dev/null
+++ b/packages/mp3blaster/mp3blaster_3.2.3.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+SECTION = "console/multimedia"
+DESCRIPTION = "A console MP3 player based on ncurses"
+DEPENDS = "ncurses libogg libvorbis"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz file://includedir.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-x=no --without-sidplay --with-oggvorbis --without-pth --without-mysql --without-nas"
diff --git a/packages/ruby/ruby-native_1.8.4.bb b/packages/ruby/ruby-native_1.8.4.bb
deleted file mode 100644
index c73e905ef4..0000000000
--- a/packages/ruby/ruby-native_1.8.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ruby_${PV}.bb
-inherit native
-DEPENDS = ""
diff --git a/packages/ruby/ruby_1.8.3.bb b/packages/ruby/ruby_1.8.3.bb
deleted file mode 100644
index 981f826dc6..0000000000
--- a/packages/ruby/ruby_1.8.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Ruby is an interpreted scripting language \
-for quick and easy object-oriented programming."
-SECTION = "devel/ruby"
-DEPENDS = "ruby-native"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
-S = "${WORKDIR}/ruby-${PV}"
-
-inherit autotools
diff --git a/packages/ruby/ruby_1.8.4.bb b/packages/ruby/ruby_1.8.4.bb
deleted file mode 100644
index 981f826dc6..0000000000
--- a/packages/ruby/ruby_1.8.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Ruby is an interpreted scripting language \
-for quick and easy object-oriented programming."
-SECTION = "devel/ruby"
-DEPENDS = "ruby-native"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
-S = "${WORKDIR}/ruby-${PV}"
-
-inherit autotools
diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index 981f826dc6..972d56e14c 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,11 +1,25 @@
 DESCRIPTION = "Ruby is an interpreted scripting language \
 for quick and easy object-oriented programming."
 SECTION = "devel/ruby"
-DEPENDS = "ruby-native"
+DEPENDS = "ruby-native zlib openssl"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \
+           file://extmk_run.patch;patch=1 \
+           file://disable_wide_getaddrinfo_check.patch;patch=1"
+
 S = "${WORKDIR}/ruby-${PV}"
 
 inherit autotools
+
+# This snippet lets compiled extensions which rely on external libraries,
+# such as zlib, compile properly.  If we don't do this, then when extmk.rb
+# runs, it uses the native libraries instead of the target libraries, and so
+# none of the linking operations succeed -- which makes extconf.rb think
+# that the libraries aren't available and hence that the extension can't be
+# built.
+
+do_configure_prepend() {
+	sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
+}
diff --git a/packages/uboot/u-boot-1.1.6/.mtn2git_empty b/packages/uboot/u-boot-1.1.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uboot/u-boot-1.1.6/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.1.6/devkit-idp.patch b/packages/uboot/u-boot-1.1.6/devkit-idp.patch
new file mode 100644
index 0000000000..1460c3d1f0
--- /dev/null
+++ b/packages/uboot/u-boot-1.1.6/devkit-idp.patch
@@ -0,0 +1,28 @@
+Index: u-boot-1.1.6/board/pxa255_idp/memsetup.S
+===================================================================
+--- u-boot-1.1.6.orig/board/pxa255_idp/memsetup.S
++++ u-boot-1.1.6/board/pxa255_idp/memsetup.S
+@@ -41,8 +41,8 @@ DRAM_SIZE:  .long   CFG_DRAM_SIZE
+ /*
+  * 	Memory setup
+  */
+-.globl memsetup
+-memsetup:
++.globl lowlevel_init
++lowlevel_init:
+ 
+ 	mov      r10, lr
+ 
+Index: u-boot-1.1.6/include/configs/pxa255_idp.h
+===================================================================
+--- u-boot-1.1.6.orig/include/configs/pxa255_idp.h
++++ u-boot-1.1.6/include/configs/pxa255_idp.h
+@@ -41,7 +41,7 @@
+  * If we are developing, we might want to start armboot from ram
+  * so we MUST NOT initialize critical regs like mem-timing ...
+  */
+-#define CONFIG_INIT_CRITICAL			/* undef for developing */
++#undef CONFIG_INIT_CRITICAL			/* undef for developing */
+ 
+ /*
+  * define the following to enable debug blinks.  A debug blink function
diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/uboot/u-boot_1.1.6.bb
index b45e86611b..bfd0fb8132 100644
--- a/packages/uboot/u-boot_1.1.6.bb
+++ b/packages/uboot/u-boot_1.1.6.bb
@@ -4,9 +4,10 @@ SECTION = "bootloader"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2"
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \
+           file://devkit-idp.patch;patch=1"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
diff --git a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
deleted file mode 100644
index 4e50706087..0000000000
--- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-BROKEN = "1"
-#not fetchable patch used
-
-DESCRIPTION = "U-boot bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
-SRCDATE = "20050818"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r3"
-
-PROVIDES = "virtual/bootloader"
-
-S = "${WORKDIR}/u-boot"
-
-SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
-	   file://arm_flags.patch;patch=1 \
-	   ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-UBOOT_MACHINE = "pxa255_idp_config"
-
-inherit base
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
-
diff --git a/packages/zlib/files/visibility.patch b/packages/zlib/files/visibility.patch
deleted file mode 100644
index ba1a2a6fef..0000000000
--- a/packages/zlib/files/visibility.patch
+++ /dev/null
@@ -1,1022 +0,0 @@
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/adler32.c	2003-11-17 15:24:27.000000000 -0600
-+++ zlib-1.2.2/adler32.c	2005-02-28 19:04:09.000000000 -0600
-@@ -44,7 +44,7 @@
- #endif
- 
- /* ========================================================================= */
--uLong ZEXPORT adler32(adler, buf, len)
-+ZEXPORT uLong adler32(adler, buf, len)
-     uLong adler;
-     const Bytef *buf;
-     uInt len;
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/compress.c	2003-07-07 00:37:56.000000000 -0500
-+++ zlib-1.2.2/compress.c	2005-02-28 19:04:09.000000000 -0600
-@@ -19,7 +19,7 @@
-    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-    Z_STREAM_ERROR if the level parameter is invalid.
- */
--int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-+ZEXPORT int compress2 (dest, destLen, source, sourceLen, level)
-     Bytef *dest;
-     uLongf *destLen;
-     const Bytef *source;
-@@ -59,7 +59,7 @@
- 
- /* ===========================================================================
-  */
--int ZEXPORT compress (dest, destLen, source, sourceLen)
-+ZEXPORT int compress (dest, destLen, source, sourceLen)
-     Bytef *dest;
-     uLongf *destLen;
-     const Bytef *source;
-@@ -72,7 +72,7 @@
-      If the default memLevel or windowBits for deflateInit() is changed, then
-    this function needs to be updated.
-  */
--uLong ZEXPORT compressBound (sourceLen)
-+ZEXPORT uLong compressBound (sourceLen)
-     uLong sourceLen;
- {
-     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/crc32.c	2004-10-03 21:29:30.000000000 -0500
-+++ zlib-1.2.2/crc32.c	2005-02-28 19:04:09.000000000 -0600
-@@ -198,7 +198,7 @@
- /* =========================================================================
-  * This function can be used by asm versions of crc32()
-  */
--const unsigned long FAR * ZEXPORT get_crc_table()
-+ZEXPORT const unsigned long FAR * get_crc_table()
- {
- #ifdef DYNAMIC_CRC_TABLE
-     if (crc_table_empty)
-@@ -212,7 +212,7 @@
- #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
- 
- /* ========================================================================= */
--unsigned long ZEXPORT crc32(crc, buf, len)
-+ZEXPORT unsigned long crc32(crc, buf, len)
-     unsigned long crc;
-     const unsigned char FAR *buf;
-     unsigned len;
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/deflate.c	2004-09-15 09:28:14.000000000 -0500
-+++ zlib-1.2.2/deflate.c	2005-02-28 19:04:09.000000000 -0600
-@@ -201,7 +201,7 @@
-     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
- 
- /* ========================================================================= */
--int ZEXPORT deflateInit_(strm, level, version, stream_size)
-+ZEXPORT int deflateInit_(strm, level, version, stream_size)
-     z_streamp strm;
-     int level;
-     const char *version;
-@@ -213,7 +213,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-+ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                   version, stream_size)
-     z_streamp strm;
-     int  level;
-@@ -311,7 +311,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-+ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength)
-     z_streamp strm;
-     const Bytef *dictionary;
-     uInt  dictLength;
-@@ -355,7 +355,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflateReset (strm)
-+ZEXPORT int deflateReset (strm)
-     z_streamp strm;
- {
-     deflate_state *s;
-@@ -391,7 +391,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflatePrime (strm, bits, value)
-+ZEXPORT int deflatePrime (strm, bits, value)
-     z_streamp strm;
-     int bits;
-     int value;
-@@ -403,7 +403,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflateParams(strm, level, strategy)
-+ZEXPORT int deflateParams(strm, level, strategy)
-     z_streamp strm;
-     int level;
-     int strategy;
-@@ -457,7 +457,7 @@
-  * But even the conservative upper bound of about 14% expansion does not
-  * seem onerous for output buffer allocation.
-  */
--uLong ZEXPORT deflateBound(strm, sourceLen)
-+ZEXPORT uLong deflateBound(strm, sourceLen)
-     z_streamp strm;
-     uLong sourceLen;
- {
-@@ -520,7 +520,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflate (strm, flush)
-+ZEXPORT int deflate (strm, flush)
-     z_streamp strm;
-     int flush;
- {
-@@ -696,7 +696,7 @@
- }
- 
- /* ========================================================================= */
--int ZEXPORT deflateEnd (strm)
-+ZEXPORT int deflateEnd (strm)
-     z_streamp strm;
- {
-     int status;
-@@ -726,7 +726,7 @@
-  * To simplify the source, this is not supported for 16-bit MSDOS (which
-  * doesn't have enough memory anyway to duplicate compression states).
-  */
--int ZEXPORT deflateCopy (dest, source)
-+ZEXPORT int deflateCopy (dest, source)
-     z_streamp dest;
-     z_streamp source;
- {
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/gzio.c	2004-10-03 21:30:37.000000000 -0500
-+++ zlib-1.2.2/gzio.c	2005-02-28 19:06:11.000000000 -0600
-@@ -205,7 +205,7 @@
- /* ===========================================================================
-      Opens a gzip (.gz) file for reading or writing.
- */
--gzFile ZEXPORT gzopen (path, mode)
-+ZEXPORT gzFile gzopen (path, mode)
-     const char *path;
-     const char *mode;
- {
-@@ -216,7 +216,7 @@
-      Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-    to mimic the behavio(u)r of fdopen.
- */
--gzFile ZEXPORT gzdopen (fd, mode)
-+ZEXPORT gzFile gzdopen (fd, mode)
-     int fd;
-     const char *mode;
- {
-@@ -231,7 +231,7 @@
- /* ===========================================================================
-  * Update the compression level and strategy
-  */
--int ZEXPORT gzsetparams (file, level, strategy)
-+ZEXPORT int gzsetparams (file, level, strategy)
-     gzFile file;
-     int level;
-     int strategy;
-@@ -391,7 +391,7 @@
-      Reads the given number of uncompressed bytes from the compressed file.
-    gzread returns the number of bytes actually read (0 for end of file).
- */
--int ZEXPORT gzread (file, buf, len)
-+ZEXPORT int gzread (file, buf, len)
-     gzFile file;
-     voidp buf;
-     unsigned len;
-@@ -500,7 +500,7 @@
-       Reads one byte from the compressed file. gzgetc returns this byte
-    or -1 in case of end of file or error.
- */
--int ZEXPORT gzgetc(file)
-+ZEXPORT int gzgetc(file)
-     gzFile file;
- {
-     unsigned char c;
-@@ -512,7 +512,7 @@
- /* ===========================================================================
-       Push one byte back onto the stream.
- */
--int ZEXPORT gzungetc(c, file)
-+ZEXPORT int gzungetc(c, file)
-     int c;
-     gzFile file;
- {
-@@ -537,7 +537,7 @@
- 
-       The current implementation is not optimized at all.
- */
--char * ZEXPORT gzgets(file, buf, len)
-+ZEXPORT char * gzgets(file, buf, len)
-     gzFile file;
-     char *buf;
-     int len;
-@@ -556,7 +556,7 @@
-      Writes the given number of uncompressed bytes into the compressed file.
-    gzwrite returns the number of bytes actually written (0 in case of error).
- */
--int ZEXPORT gzwrite (file, buf, len)
-+ZEXPORT int gzwrite (file, buf, len)
-     gzFile file;
-     voidpc buf;
-     unsigned len;
-@@ -600,7 +600,7 @@
- #ifdef STDC
- #include <stdarg.h>
- 
--int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-+ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...)
- {
-     char buf[Z_PRINTF_BUFSIZE];
-     va_list va;
-@@ -634,7 +634,7 @@
- }
- #else /* not ANSI C */
- 
--int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-+ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-     gzFile file;
-     const char *format;
-@@ -675,7 +675,7 @@
-       Writes c, converted to an unsigned char, into the compressed file.
-    gzputc returns the value that was written, or -1 in case of error.
- */
--int ZEXPORT gzputc(file, c)
-+ZEXPORT int gzputc(file, c)
-     gzFile file;
-     int c;
- {
-@@ -690,7 +690,7 @@
-    the terminating null character.
-       gzputs returns the number of characters written, or -1 in case of error.
- */
--int ZEXPORT gzputs(file, s)
-+ZEXPORT int gzputs(file, s)
-     gzFile file;
-     const char *s;
- {
-@@ -743,7 +743,7 @@
-     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
- }
- 
--int ZEXPORT gzflush (file, flush)
-+ZEXPORT int gzflush (file, flush)
-      gzFile file;
-      int flush;
- {
-@@ -764,7 +764,7 @@
-       SEEK_END is not implemented, returns error.
-       In this version of the library, gzseek can be extremely slow.
- */
--z_off_t ZEXPORT gzseek (file, offset, whence)
-+ZEXPORT z_off_t gzseek (file, offset, whence)
-     gzFile file;
-     z_off_t offset;
-     int whence;
-@@ -854,7 +854,7 @@
- /* ===========================================================================
-      Rewinds input file.
- */
--int ZEXPORT gzrewind (file)
-+ZEXPORT int gzrewind (file)
-     gzFile file;
- {
-     gz_stream *s = (gz_stream*)file;
-@@ -878,7 +878,7 @@
-    given compressed file. This position represents a number of bytes in the
-    uncompressed data stream.
- */
--z_off_t ZEXPORT gztell (file)
-+ZEXPORT z_off_t gztell (file)
-     gzFile file;
- {
-     return gzseek(file, 0L, SEEK_CUR);
-@@ -888,7 +888,7 @@
-      Returns 1 when EOF has previously been detected reading the given
-    input stream, otherwise zero.
- */
--int ZEXPORT gzeof (file)
-+ZEXPORT int gzeof (file)
-     gzFile file;
- {
-     gz_stream *s = (gz_stream*)file;
-@@ -938,7 +938,7 @@
-      Flushes all pending output if necessary, closes the compressed file
-    and deallocates all the (de)compression state.
- */
--int ZEXPORT gzclose (file)
-+ZEXPORT int gzclose (file)
-     gzFile file;
- {
-     int err;
-@@ -967,7 +967,7 @@
-    errnum is set to Z_ERRNO and the application may consult errno
-    to get the exact error code.
- */
--const char * ZEXPORT gzerror (file, errnum)
-+ZEXPORT const char * gzerror (file, errnum)
-     gzFile file;
-     int *errnum;
- {
-@@ -997,7 +997,7 @@
- /* ===========================================================================
-      Clear the error and end-of-file flags, and do the same for the real file.
- */
--void ZEXPORT gzclearerr (file)
-+ZEXPORT void gzclearerr (file)
-     gzFile file;
- {
-     gz_stream *s = (gz_stream*)file;
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/infback.c	2004-10-03 21:31:20.000000000 -0500
-+++ zlib-1.2.2/infback.c	2005-02-28 19:04:09.000000000 -0600
-@@ -25,7 +25,7 @@
-    windowBits is in the range 8..15, and window is a user-supplied
-    window and output buffer that is 2**windowBits bytes.
-  */
--int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-+ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size)
- z_stream FAR *strm;
- int windowBits;
- unsigned char FAR *window;
-@@ -237,7 +237,7 @@
-    inflateBack() can also return Z_STREAM_ERROR if the input parameters
-    are not correct, i.e. strm is Z_NULL or the state was not initialized.
-  */
--int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-+ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc)
- z_stream FAR *strm;
- in_func in;
- void FAR *in_desc;
-@@ -610,7 +610,7 @@
-     return ret;
- }
- 
--int ZEXPORT inflateBackEnd(strm)
-+ZEXPORT int inflateBackEnd(strm)
- z_stream FAR *strm;
- {
-     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/inflate.c	2004-10-03 21:33:51.000000000 -0500
-+++ zlib-1.2.2/inflate.c	2005-02-28 19:04:09.000000000 -0600
-@@ -100,7 +100,7 @@
- local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
-                               unsigned len));
- 
--int ZEXPORT inflateReset(strm)
-+ZEXPORT int inflateReset(strm)
- z_streamp strm;
- {
-     struct inflate_state FAR *state;
-@@ -122,7 +122,7 @@
-     return Z_OK;
- }
- 
--int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-+ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size)
- z_streamp strm;
- int windowBits;
- const char *version;
-@@ -165,7 +165,7 @@
-     return inflateReset(strm);
- }
- 
--int ZEXPORT inflateInit_(strm, version, stream_size)
-+ZEXPORT int inflateInit_(strm, version, stream_size)
- z_streamp strm;
- const char *version;
- int stream_size;
-@@ -532,7 +532,7 @@
-    will return Z_BUF_ERROR if it has not reached the end of the stream.
-  */
- 
--int ZEXPORT inflate(strm, flush)
-+ZEXPORT int inflate(strm, flush)
- z_streamp strm;
- int flush;
- {
-@@ -1085,7 +1085,7 @@
-     return ret;
- }
- 
--int ZEXPORT inflateEnd(strm)
-+ZEXPORT int inflateEnd(strm)
- z_streamp strm;
- {
-     struct inflate_state FAR *state;
-@@ -1099,7 +1099,7 @@
-     return Z_OK;
- }
- 
--int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-+ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength)
- z_streamp strm;
- const Bytef *dictionary;
- uInt dictLength;
-@@ -1171,7 +1171,7 @@
-     return next;
- }
- 
--int ZEXPORT inflateSync(strm)
-+ZEXPORT int inflateSync(strm)
- z_streamp strm;
- {
-     unsigned len;               /* number of bytes to look at or looked at */
-@@ -1222,7 +1222,7 @@
-    block. When decompressing, PPP checks that at the end of input packet,
-    inflate is waiting for these length bytes.
-  */
--int ZEXPORT inflateSyncPoint(strm)
-+ZEXPORT int inflateSyncPoint(strm)
- z_streamp strm;
- {
-     struct inflate_state FAR *state;
-@@ -1232,7 +1232,7 @@
-     return state->mode == STORED && state->bits == 0;
- }
- 
--int ZEXPORT inflateCopy(dest, source)
-+ZEXPORT int inflateCopy(dest, source)
- z_streamp dest;
- z_streamp source;
- {
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/uncompr.c	2003-07-07 00:36:56.000000000 -0500
-+++ zlib-1.2.2/uncompr.c	2005-02-28 19:04:09.000000000 -0600
-@@ -23,7 +23,7 @@
-    enough memory, Z_BUF_ERROR if there was not enough room in the output
-    buffer, or Z_DATA_ERROR if the input data was corrupted.
- */
--int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-+ZEXPORT int uncompress (dest, destLen, source, sourceLen)
-     Bytef *dest;
-     uLongf *destLen;
-     const Bytef *source;
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zconf.in.h	2004-05-30 15:38:00.000000000 -0500
-+++ zlib-1.2.2/zconf.in.h	2005-02-28 19:04:09.000000000 -0600
-@@ -198,11 +198,9 @@
-     */
- #  ifdef ZLIB_DLL
- #    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
--#      ifdef ZLIB_INTERNAL
--#        define ZEXTERN extern __declspec(dllexport)
--#      else
--#        define ZEXTERN extern __declspec(dllimport)
--#      endif
-+#      define ZDLLLOCAL __declspec(dllimport)
-+#      define ZDLLPUBLIC __declspec(dllexport)
-+#      define ZEXTERN extern
- #    endif
- #  endif  /* ZLIB_DLL */
-    /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-@@ -223,30 +221,45 @@
- #      define ZEXPORTVA FAR CDECL
- #    endif
- #  endif
--#endif
--
--#if defined (__BEOS__)
-+#elif defined (__BEOS__)
- #  ifdef ZLIB_DLL
--#    ifdef ZLIB_INTERNAL
--#      define ZEXPORT   __declspec(dllexport)
--#      define ZEXPORTVA __declspec(dllexport)
--#    else
--#      define ZEXPORT   __declspec(dllimport)
--#      define ZEXPORTVA __declspec(dllimport)
--#    endif
-+#    define ZDLLIMPORT __declspec(dllimport)
-+#    define ZDLLPUBLIC __declspec(dllexport)
-+#    define ZDLLLOCAL
-+#  endif
-+#else
-+#  define ZDLLIMPORT
-+#  ifdef GCC_HASCLASSVISIBILITY
-+#    define ZDLLLOCAL __attribute__ ((visibility("hidden")))
-+#    define ZDLLPUBLIC __attribute__ ((visibility("default")))
-+#  else
-+#    define ZDLLLOCAL
-+#    define ZDLLPUBLIC
- #  endif
- #endif
- 
- #ifndef ZEXTERN
- #  define ZEXTERN extern
- #endif
--#ifndef ZEXPORT
--#  define ZEXPORT
--#endif
--#ifndef ZEXPORTVA
--#  define ZEXPORTVA
-+#ifdef ZLIB_INTERNAL
-+#  ifndef ZLIB_DLL
-+#   define ZEXPORT
-+#   define ZEXPORTVA
-+#  endif
-+#  ifndef ZEXPORT
-+#    define ZEXPORT ZDLLPUBLIC
-+#  endif
-+#  ifndef ZEXPORTVA
-+#    define ZEXPORTVA ZDLLPUBLIC
-+#  endif
-+#else
-+#  ifndef ZEXPORT
-+#    define ZEXPORT ZDLLIMPORT
-+#  endif
-+#  ifndef ZEXPORTVA
-+#    define ZEXPORTVA ZDLLIMPORT
-+#  endif
- #endif
--
- #ifndef FAR
- #  define FAR
- #endif
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zlib.h	2004-10-03 21:57:26.000000000 -0500
-+++ zlib-1.2.2/zlib.h	2005-02-28 19:04:09.000000000 -0600
-@@ -184,7 +184,7 @@
- 
-                         /* basic functions */
- 
--ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-+ZEXTERN ZEXPORT const char * zlibVersion OF((void));
- /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-    If the first character differs, the library code actually used is
-    not compatible with the zlib.h header file used by the application.
-@@ -192,7 +192,7 @@
-  */
- 
- /*
--ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-+ZEXTERN ZEXPORT int deflateInit OF((z_streamp strm, int level));
- 
-      Initializes the internal stream state for compression. The fields
-    zalloc, zfree and opaque must be initialized before by the caller.
-@@ -214,7 +214,7 @@
- */
- 
- 
--ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-+ZEXTERN ZEXPORT int deflate OF((z_streamp strm, int flush));
- /*
-     deflate compresses as much data as possible, and stops when the input
-   buffer becomes empty or the output buffer becomes full. It may introduce some
-@@ -296,7 +296,7 @@
- */
- 
- 
--ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-+ZEXTERN ZEXPORT int deflateEnd OF((z_streamp strm));
- /*
-      All dynamically allocated data structures for this stream are freed.
-    This function discards any unprocessed input and does not flush any
-@@ -311,7 +311,7 @@
- 
- 
- /*
--ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-+ZEXTERN ZEXPORT int inflateInit OF((z_streamp strm));
- 
-      Initializes the internal stream state for decompression. The fields
-    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-@@ -331,7 +331,7 @@
- */
- 
- 
--ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-+ZEXTERN ZEXPORT int inflate OF((z_streamp strm, int flush));
- /*
-     inflate decompresses as much data as possible, and stops when the input
-   buffer becomes empty or the output buffer becomes full. It may introduce
-@@ -430,7 +430,7 @@
- */
- 
- 
--ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-+ZEXTERN ZEXPORT int inflateEnd OF((z_streamp strm));
- /*
-      All dynamically allocated data structures for this stream are freed.
-    This function discards any unprocessed input and does not flush any
-@@ -448,7 +448,7 @@
- */
- 
- /*
--ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-+ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm,
-                                      int  level,
-                                      int  method,
-                                      int  windowBits,
-@@ -504,7 +504,7 @@
-    not perform any compression: this will be done by deflate().
- */
- 
--ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-+ZEXTERN ZEXPORT int deflateSetDictionary OF((z_streamp strm,
-                                              const Bytef *dictionary,
-                                              uInt  dictLength));
- /*
-@@ -541,7 +541,7 @@
-    perform any compression: this will be done by deflate().
- */
- 
--ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-+ZEXTERN ZEXPORT int deflateCopy OF((z_streamp dest,
-                                     z_streamp source));
- /*
-      Sets the destination stream as a complete copy of the source stream.
-@@ -559,7 +559,7 @@
-    destination.
- */
- 
--ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-+ZEXTERN ZEXPORT int deflateReset OF((z_streamp strm));
- /*
-      This function is equivalent to deflateEnd followed by deflateInit,
-    but does not free and reallocate all the internal compression state.
-@@ -570,7 +570,7 @@
-    stream state was inconsistent (such as zalloc or state being NULL).
- */
- 
--ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-+ZEXTERN ZEXPORT int deflateParams OF((z_streamp strm,
-                                       int level,
-                                       int strategy));
- /*
-@@ -591,7 +591,7 @@
-    if strm->avail_out was zero.
- */
- 
--ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-+ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm,
-                                        uLong sourceLen));
- /*
-      deflateBound() returns an upper bound on the compressed size after
-@@ -600,7 +600,7 @@
-    for deflation in a single pass, and so would be called before deflate().
- */
- 
--ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-+ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm,
-                                      int bits,
-                                      int value));
- /*
-@@ -617,7 +617,7 @@
- */
- 
- /*
--ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-+ZEXTERN ZEXPORT int inflateInit2 OF((z_streamp strm,
-                                      int  windowBits));
- 
-      This is another version of inflateInit with an extra parameter. The
-@@ -659,7 +659,7 @@
-    modified, but next_out and avail_out are unchanged.)
- */
- 
--ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-+ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm,
-                                              const Bytef *dictionary,
-                                              uInt  dictLength));
- /*
-@@ -678,7 +678,7 @@
-    inflate().
- */
- 
--ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-+ZEXTERN ZEXPORT int inflateSync OF((z_streamp strm));
- /*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
-@@ -693,7 +693,7 @@
-   until success or end of the input data.
- */
- 
--ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-+ZEXTERN ZEXPORT int inflateCopy OF((z_streamp dest,
-                                     z_streamp source));
- /*
-      Sets the destination stream as a complete copy of the source stream.
-@@ -709,7 +709,7 @@
-    destination.
- */
- 
--ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-+ZEXTERN ZEXPORT int inflateReset OF((z_streamp strm));
- /*
-      This function is equivalent to inflateEnd followed by inflateInit,
-    but does not free and reallocate all the internal decompression state.
-@@ -720,7 +720,7 @@
- */
- 
- /*
--ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
-+ZEXTERN ZEXPORT int inflateBackInit OF((z_stream FAR *strm, int windowBits,
-                                         unsigned char FAR *window));
- 
-      Initialize the internal stream state for decompression using inflateBack()
-@@ -744,7 +744,7 @@
- typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
- typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
- 
--ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
-+ZEXTERN ZEXPORT int inflateBack OF((z_stream FAR *strm,
-                                     in_func in, void FAR *in_desc,
-                                     out_func out, void FAR *out_desc));
- /*
-@@ -813,7 +813,7 @@
-    that inflateBack() cannot return Z_OK.
- */
- 
--ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));
-+ZEXTERN ZEXPORT int inflateBackEnd OF((z_stream FAR *strm));
- /*
-      All memory allocated by inflateBackInit() is freed.
- 
-@@ -821,7 +821,7 @@
-    state was inconsistent.
- */
- 
--ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-+ZEXTERN ZEXPORT uLong zlibCompileFlags OF((void));
- /* Return flags indicating compile-time options.
- 
-     Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-@@ -873,7 +873,7 @@
-    utility functions can easily be modified if you need special options.
- */
- 
--ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-+ZEXTERN ZEXPORT int compress OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen));
- /*
-      Compresses the source buffer into the destination buffer.  sourceLen is
-@@ -888,7 +888,7 @@
-    buffer.
- */
- 
--ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-+ZEXTERN ZEXPORT int compress2 OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen,
-                                   int level));
- /*
-@@ -904,14 +904,14 @@
-    Z_STREAM_ERROR if the level parameter is invalid.
- */
- 
--ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-+ZEXTERN ZEXPORT uLong compressBound OF((uLong sourceLen));
- /*
-      compressBound() returns an upper bound on the compressed size after
-    compress() or compress2() on sourceLen bytes.  It would be used before
-    a compress() or compress2() call to allocate the destination buffer.
- */
- 
--ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-+ZEXTERN ZEXPORT int uncompress OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong sourceLen));
- /*
-      Decompresses the source buffer into the destination buffer.  sourceLen is
-@@ -932,7 +932,7 @@
- 
- typedef voidp gzFile;
- 
--ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-+ZEXTERN ZEXPORT gzFile gzopen  OF((const char *path, const char *mode));
- /*
-      Opens a gzip (.gz) file for reading or writing. The mode parameter
-    is as in fopen ("rb" or "wb") but can also include a compression level
-@@ -949,7 +949,7 @@
-    can be checked to distinguish the two cases (if errno is zero, the
-    zlib error is Z_MEM_ERROR).  */
- 
--ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-+ZEXTERN ZEXPORT gzFile gzdopen  OF((int fd, const char *mode));
- /*
-      gzdopen() associates a gzFile with the file descriptor fd.  File
-    descriptors are obtained from calls like open, dup, creat, pipe or
-@@ -962,7 +962,7 @@
-    the (de)compression state.
- */
- 
--ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-+ZEXTERN ZEXPORT int gzsetparams OF((gzFile file, int level, int strategy));
- /*
-      Dynamically update the compression level or strategy. See the description
-    of deflateInit2 for the meaning of these parameters.
-@@ -970,7 +970,7 @@
-    opened for writing.
- */
- 
--ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-+ZEXTERN ZEXPORT int    gzread  OF((gzFile file, voidp buf, unsigned len));
- /*
-      Reads the given number of uncompressed bytes from the compressed file.
-    If the input file was not in gzip format, gzread copies the given number
-@@ -978,7 +978,7 @@
-      gzread returns the number of uncompressed bytes actually read (0 for
-    end of file, -1 for error). */
- 
--ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-+ZEXTERN ZEXPORT int    gzwrite OF((gzFile file,
-                                    voidpc buf, unsigned len));
- /*
-      Writes the given number of uncompressed bytes into the compressed file.
-@@ -986,7 +986,7 @@
-    (0 in case of error).
- */
- 
--ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-+ZEXTERN ZEXPORTVA int   gzprintf OF((gzFile file, const char *format, ...));
- /*
-      Converts, formats, and writes the args to the compressed file under
-    control of the format string, as in fprintf. gzprintf returns the number of
-@@ -999,14 +999,14 @@
-    because the secure snprintf() or vsnprintf() functions were not available.
- */
- 
--ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-+ZEXTERN ZEXPORT int gzputs OF((gzFile file, const char *s));
- /*
-       Writes the given null-terminated string to the compressed file, excluding
-    the terminating null character.
-       gzputs returns the number of characters written, or -1 in case of error.
- */
- 
--ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-+ZEXTERN ZEXPORT char *  gzgets OF((gzFile file, char *buf, int len));
- /*
-       Reads bytes from the compressed file until len-1 characters are read, or
-    a newline character is read and transferred to buf, or an end-of-file
-@@ -1015,19 +1015,19 @@
-       gzgets returns buf, or Z_NULL in case of error.
- */
- 
--ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-+ZEXTERN ZEXPORT int    gzputc OF((gzFile file, int c));
- /*
-       Writes c, converted to an unsigned char, into the compressed file.
-    gzputc returns the value that was written, or -1 in case of error.
- */
- 
--ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-+ZEXTERN ZEXPORT int    gzgetc OF((gzFile file));
- /*
-       Reads one byte from the compressed file. gzgetc returns this byte
-    or -1 in case of end of file or error.
- */
- 
--ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-+ZEXTERN ZEXPORT int    gzungetc OF((int c, gzFile file));
- /*
-       Push one character back onto the stream to be read again later.
-    Only one character of push-back is allowed.  gzungetc() returns the
-@@ -1037,7 +1037,7 @@
-    or gzrewind().
- */
- 
--ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-+ZEXTERN ZEXPORT int    gzflush OF((gzFile file, int flush));
- /*
-      Flushes all pending output into the compressed file. The parameter
-    flush is as in the deflate() function. The return value is the zlib
-@@ -1047,7 +1047,7 @@
-    degrade compression.
- */
- 
--ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-+ZEXTERN ZEXPORT z_off_t    gzseek OF((gzFile file,
-                                       z_off_t offset, int whence));
- /*
-       Sets the starting position for the next gzread or gzwrite on the
-@@ -1065,14 +1065,14 @@
-    would be before the current position.
- */
- 
--ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-+ZEXTERN ZEXPORT int    gzrewind OF((gzFile file));
- /*
-      Rewinds the given file. This function is supported only for reading.
- 
-    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
- */
- 
--ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-+ZEXTERN ZEXPORT z_off_t    gztell OF((gzFile file));
- /*
-      Returns the starting position for the next gzread or gzwrite on the
-    given compressed file. This position represents a number of bytes in the
-@@ -1081,20 +1081,20 @@
-    gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
- */
- 
--ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-+ZEXTERN ZEXPORT int gzeof OF((gzFile file));
- /*
-      Returns 1 when EOF has previously been detected reading the given
-    input stream, otherwise zero.
- */
- 
--ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-+ZEXTERN ZEXPORT int    gzclose OF((gzFile file));
- /*
-      Flushes all pending output if necessary, closes the compressed file
-    and deallocates all the (de)compression state. The return value is the zlib
-    error number (see function gzerror below).
- */
- 
--ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-+ZEXTERN ZEXPORT const char *  gzerror OF((gzFile file, int *errnum));
- /*
-      Returns the error message for the last error which occurred on the
-    given compressed file. errnum is set to zlib error number. If an
-@@ -1103,7 +1103,7 @@
-    to get the exact error code.
- */
- 
--ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-+ZEXTERN ZEXPORT void gzclearerr OF((gzFile file));
- /*
-      Clears the error and end-of-file flags for file. This is analogous to the
-    clearerr() function in stdio. This is useful for continuing to read a gzip
-@@ -1118,7 +1118,7 @@
-    compression library.
- */
- 
--ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-+ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len));
- 
- /*
-      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-@@ -1135,7 +1135,7 @@
-      if (adler != original_adler) error();
- */
- 
--ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-+ZEXTERN ZEXPORT uLong crc32   OF((uLong crc, const Bytef *buf, uInt len));
- /*
-      Update a running crc with the bytes buf[0..len-1] and return the updated
-    crc. If buf is NULL, this function returns the required initial value
-@@ -1157,17 +1157,17 @@
- /* deflateInit and inflateInit are macros to allow checking the zlib version
-  * and the compiler's view of z_stream:
-  */
--ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-+ZEXTERN ZEXPORT int deflateInit_ OF((z_streamp strm, int level,
-                                      const char *version, int stream_size));
--ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-+ZEXTERN ZEXPORT int inflateInit_ OF((z_streamp strm,
-                                      const char *version, int stream_size));
--ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-+ZEXTERN ZEXPORT int deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                       int windowBits, int memLevel,
-                                       int strategy, const char *version,
-                                       int stream_size));
--ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-+ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                       const char *version, int stream_size));
--ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
-+ZEXTERN ZEXPORT int inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
-                                          unsigned char FAR *window,
-                                          const char *version,
-                                          int stream_size));
-@@ -1189,9 +1189,9 @@
-     struct internal_state {int dummy;}; /* hack for buggy compilers */
- #endif
- 
--ZEXTERN const char   * ZEXPORT zError           OF((int));
--ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
--ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-+ZEXTERN ZEXPORT const char   *  zError           OF((int));
-+ZEXTERN ZEXPORT int            inflateSyncPoint OF((z_streamp z));
-+ZEXTERN ZEXPORT const uLongf *  get_crc_table    OF((void));
- 
- #ifdef __cplusplus
- }
---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zutil.c	2003-08-27 21:34:34.000000000 -0500
-+++ zlib-1.2.2/zutil.c	2005-02-28 19:04:09.000000000 -0600
-@@ -28,12 +28,12 @@
- ""};
- 
- 
--const char * ZEXPORT zlibVersion()
-+ZEXPORT const char * zlibVersion()
- {
-     return ZLIB_VERSION;
- }
- 
--uLong ZEXPORT zlibCompileFlags()
-+ZEXPORT uLong zlibCompileFlags()
- {
-     uLong flags;
- 
-@@ -134,7 +134,7 @@
- /* exported to allow conversion of error code to string for compress() and
-  * uncompress()
-  */
--const char * ZEXPORT zError(err)
-+ZEXPORT const char * zError(err)
-     int err;
- {
-     return ERR_MSG(err);
diff --git a/packages/zlib/files/zlib_1.2.2-8.diff.gz b/packages/zlib/files/zlib_1.2.2-8.diff.gz
deleted file mode 100644
index c850141973..0000000000
--- a/packages/zlib/files/zlib_1.2.2-8.diff.gz
+++ /dev/null
diff --git a/packages/zlib/zlib-native_1.1.4.bb b/packages/zlib/zlib-native_1.1.4.bb
deleted file mode 100644
index eb551364ac..0000000000
--- a/packages/zlib/zlib-native_1.1.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "libs"
-require zlib_${PV}.bb
-inherit native
-DEPENDS = ""
diff --git a/packages/zlib/zlib-native_1.2.2.bb b/packages/zlib/zlib-native_1.2.2.bb
deleted file mode 100644
index eb551364ac..0000000000
--- a/packages/zlib/zlib-native_1.2.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "libs"
-require zlib_${PV}.bb
-inherit native
-DEPENDS = ""
diff --git a/packages/zlib/zlib_1.1.4.bb b/packages/zlib/zlib_1.1.4.bb
deleted file mode 100644
index 768b1bc91a..0000000000
--- a/packages/zlib/zlib_1.1.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Zlib Compression Library"
-SECTION = "libs"
-PRIORITY = "required"
-HOMEPAGE = "http://www.gzip.org/zlib/"
-LICENSE = "zlib"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib-${PV}.tar.gz"
-
-S = "${WORKDIR}/zlib-${PV}"
-
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC "
-AR_append = " rc"
-EXTRA_OEMAKE = ""
-
-do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-	oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
-}
-
-do_stage() {
-	install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
-	install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
-	oe_libinstall -a -so libz ${STAGING_LIBDIR}
-}
-
-do_install() {
-	install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
-	oe_runmake "prefix=${D}${prefix}" "includedir=${D}${includedir}" \
-		   "libdir=${D}${libdir}" install
-}
diff --git a/packages/zlib/zlib_1.2.2.bb b/packages/zlib/zlib_1.2.2.bb
deleted file mode 100644
index 1f543f04b4..0000000000
--- a/packages/zlib/zlib_1.2.2.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Zlib Compression Library"
-SECTION = "libs"
-PRIORITY = "required"
-HOMEPAGE = "http://www.gzip.org/zlib/"
-LICENSE = "zlib"
-PR = "r6"
-
-SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz \
-		file://visibility.patch;patch=1 \
-		file://zlib_1.2.2-8.diff.gz;patch=1 "
-S = "${WORKDIR}/zlib-${PV}"
-
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC -DZLIB_DLL "
-AR_append = " rc"
-EXTRA_OEMAKE = ""
-
-do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-	oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
-}
-
-do_stage() {
-	install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
-	install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
-	oe_libinstall -a -so libz ${STAGING_LIBDIR}
-}
-
-do_install() {
-	install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
-	oe_runmake "prefix=${D}${prefix}" \
-		   "exec_prefix=${D}${exec_prefix}" \
-		   "man3dir=${D}${mandir}/man3" \
-		   "includedir=${D}${includedir}" \
-		   "libdir=${D}${libdir}" install
-}