summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/package_ipk.bbclass1
-rw-r--r--classes/package_rpm.bbclass1
-rw-r--r--classes/package_tar.bbclass1
-rw-r--r--conf/bitbake.conf8
-rw-r--r--conf/distro/angstrom-2007.1.conf2
-rw-r--r--conf/machine/h5000.conf (renamed from conf/machine/h5xxx.conf)4
-rw-r--r--conf/machine/mx21ads.conf20
-rw-r--r--conf/sanity.conf2
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/altboot_1.1.0-wip.bb2
-rw-r--r--packages/altboot/files/altboot-menu/15-bootSD2
-rw-r--r--packages/altboot/files/altboot-menu/20-bootCF2
-rw-r--r--packages/altboot/files/altboot-menu/Advanced/40-bootNFS2
-rw-r--r--packages/altboot/files/altboot-menu/Advanced/55-bin-sh1
-rw-r--r--packages/altboot/files/init.altboot4
-rw-r--r--packages/altboot/files/poodle/altboot-2.6.cfg10
-rw-r--r--packages/apt/apt-0.6.46.2/.mtn2git_empty (renamed from packages/apt/apt-0.6.46/.mtn2git_empty)0
-rw-r--r--packages/apt/apt-0.6.46.2/autofoo.patch (renamed from packages/apt/apt-0.6.46/autofoo.patch)0
-rw-r--r--packages/apt/apt-0.6.46.2/noconfigure.patch (renamed from packages/apt/apt-0.6.46/noconfigure.patch)0
-rw-r--r--packages/apt/apt-0.6.46.2/nodoc.patch (renamed from packages/apt/apt-0.6.46/nodoc.patch)0
-rw-r--r--packages/apt/apt-native_0.6.46.2.bb (renamed from packages/apt/apt-native_0.6.46.bb)0
-rw-r--r--packages/apt/apt_0.6.46.2.bb9
-rw-r--r--packages/apt/apt_0.6.46.bb43
-rw-r--r--packages/base-files/base-files/h5000/.mtn2git_empty (renamed from packages/base-files/base-files/h5xxx/.mtn2git_empty)0
-rw-r--r--packages/base-files/base-files/h5000/fstab (renamed from packages/base-files/base-files/h5xxx/fstab)0
-rw-r--r--packages/esound/esound-gpe_20020817.bb2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb2
-rw-r--r--packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb2
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig (renamed from packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig)0
-rw-r--r--packages/linux/linux-handhelds-2.6.inc2
-rw-r--r--packages/linux/mx21ads-kernel/.mtn2git_empty (renamed from packages/tslib/tslib/h5xxx/.mtn2git_empty)0
-rw-r--r--packages/linux/mx21ads-kernel/mx21ads_defconfig1180
-rw-r--r--packages/linux/mx21ads-kernel_2.6.19rc6.bb61
-rw-r--r--packages/linux/mx31ads-kernel/imx31ads_defconfig10
-rw-r--r--packages/linux/mx31ads-kernel_2.6.19rc6.bb (renamed from packages/linux/mx31ads-kernel_2.6.19rc5.bb)11
-rw-r--r--packages/omniorb/omniorb-native_4.0.7.bb20
-rw-r--r--packages/omniorb/omniorb_4.0.7.bb29
-rw-r--r--packages/qte/qte-common_2.3.10.inc4
-rw-r--r--packages/tasks/task-ossie.bb17
-rw-r--r--packages/tslib/tslib/h5000/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/h5000/tslib.sh (renamed from packages/tslib/tslib/h5xxx/tslib.sh)0
-rw-r--r--packages/tslib/tslib_1.0.bb2
45 files changed, 1345 insertions, 117 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index d69fa09d1e..4c14409b9d 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -2,6 +2,7 @@ inherit package
DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
PACKAGE_WRITE_FUNCS += "do_package_ipk"
+IMAGE_PKGTYPE ?= "ipk"
python package_ipk_fn () {
from bb import data
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index d5a1c8b379..4955792916 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -3,6 +3,7 @@ inherit rpm_core
RPMBUILD="rpmbuild --short-circuit ${RPMOPTS}"
PACKAGE_WRITE_FUNCS += "do_package_rpm"
+IMAGE_PKGTYPE ?= "rpm"
python write_specfile() {
from bb import data, build
diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index 9217811e38..b048b08ebe 100644
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -1,6 +1,7 @@
inherit package
PACKAGE_WRITE_FUNCS += "do_package_tar"
+IMAGE_PKGTYPE ?= "tar"
python package_tar_fn () {
import os
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b2d7e2b875..2d739f3bcc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -139,7 +139,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
##################################################################
TMPDIR = "${TOPDIR}/tmp"
-CACHE = "${TMPDIR}/cache"
+CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
DL_DIR = "${TMPDIR}/downloads"
CVSDIR = "${DL_DIR}/cvs"
SVNDIR = "${DL_DIR}/svn"
@@ -165,6 +165,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
+DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
##################################################################
# Kernel info.
@@ -197,8 +198,6 @@ EXTRA_IMAGECMD = ""
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
EXTRA_IMAGECMD_squashfs = "-le -b 16384"
EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
-IMAGE_ROOTFS_SIZE_ext2 = "65536"
-IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
IMAGE_DEPENDS = ""
IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -419,7 +418,8 @@ require conf/sanity.conf
IMAGE_FSTYPES ?= "jffs2"
PCMCIA_MANAGER ?= "pcmcia-cs"
MACHINE_TASK_PROVIDER ?= "task-bootstrap"
-
+IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
##################################################################
# Magic Cookie for SANITY CHECK
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f593194ba6..05acebfa8f 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te"
FEED_ARCH_c7x0 = "armv5te"
FEED_ARCH_h2200 = "armv5te"
FEED_ARCH_h4000 = "armv5te"
-FEED_ARCH_h5xxx = "armv5te"
+FEED_ARCH_h5000 = "armv5te"
FEED_ARCH_htcuniversal = "armv5te"
FEED_ARCH_hx2000 = "armv5te"
FEED_ARCH_hx4700 = "armv5te"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5000.conf
index 5aac579e91..ffc1328f50 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx"
require conf/machine/include/tune-xscale.conf
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf
new file mode 100644
index 0000000000..77961714eb
--- /dev/null
+++ b/conf/machine/mx21ads.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Freescale MX21ADS
+#@DESCRIPTION: Machine configuration for Freescale MX21ADS
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+include conf/machine/include/tune-arm926ejs.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 6f30cd24ea..58313f27ca 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.4.2"
+BB_MIN_VERSION = "1.6.2"
INHERIT += "sanity"
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 3908b5dacd..8cc722e603 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
######################################################################################
-PR = "r49"
+PR = "r50"
######################################################################################
diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb
index df9ac5abfb..1ca672d7ce 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_1.1.0-wip.bb
@@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-WIP_DATE = "20061108"
+WIP_DATE = "20061120"
PR = "${WIP_DATE}-r1"
######################################################################################
diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD
index 0476a5ce0f..3cf49deea5 100644
--- a/packages/altboot/files/altboot-menu/15-bootSD
+++ b/packages/altboot/files/altboot-menu/15-bootSD
@@ -7,6 +7,8 @@
M_TITLE="Boot SD card"
+test "$DISABLE_SD_BOOT" = yes && exit 0
+
# This function is activated by init.altboot by calling this script with the "run" option
run_module() {
diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF
index 36d6b8245f..4add6e6631 100644
--- a/packages/altboot/files/altboot-menu/20-bootCF
+++ b/packages/altboot/files/altboot-menu/20-bootCF
@@ -7,6 +7,8 @@
M_TITLE="Boot CF card"
+test "$DISABLE_CF_BOOT" = yes && exit 0
+
# This function is activated by init.altboot by calling this script with the "run" option
run_module() {
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 87373d8eec..4f5c195be2 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -9,6 +9,8 @@
M_TITLE="Boot from NFS"
+test "$DISABLE_NFS_BOOT" = yes && exit 0
+
# This function is activated by init.altboot by calling this script with the "run" option
run_module() {
diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
index 4619e51ce7..6c9aef3f3e 100644
--- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
+++ b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
@@ -1,6 +1,7 @@
# !/bin/sh
M_TITLE="init=/bin/sh"
+test "$DISABLE_BINSH_BOOT" = yes && exit 0
run_module() {
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index b872af2d20..033fb2124f 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -95,7 +95,9 @@ show_menu() {
do
if ! test -d "$1/$file"
then
- M_TITLE="`$1/$file title`"
+ # NOTE: It is important to use "." here so that the script inherits
+ # the shell environment / all set variables!
+ M_TITLE="`. $1/$file title`"
FLAGS="`$1/$file flags`"
if ! test -z "$M_TITLE"
diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg
index d976ee3a20..908a9ac88f 100644
--- a/packages/altboot/files/poodle/altboot-2.6.cfg
+++ b/packages/altboot/files/poodle/altboot-2.6.cfg
@@ -1,5 +1,5 @@
#
-# Altboot machine configuration for: Akita / Kernel 2.6
+# Altboot machine configuration for: Poodle / Kernel 2.6
#
# Handled by /sbin/init.altboot
@@ -10,7 +10,7 @@ TIMEOUT="4"
REAL_INIT="/sbin/init.sysvinit"
SH_SHELL="/bin/sh"
-ENABLE_SOUND="yes"
+ENABLE_SOUND="no"
IMAGE_PATH="boot-images"
IMAGE_TYPE="ext2"
@@ -20,7 +20,7 @@ ENABLE_IMAGECONF="yes"
SD_DEVICE="/dev/mmcblk0p1"
SD_KERNEL_MODULE=""
-USB_HOST_AVAILABLE="no"
+USB_HOST_AVAILABLE="yes"
USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
USB_STORAGE_PARTITION="/dev/sda1"
USB_STORAGE_WAIT="4"
@@ -39,3 +39,7 @@ ASK_PW_ON_BOOT="no"
SD_MOUNTPOINT="/media/card"
CF_MOUNTPOINT="/media/cf"
+
+# Poodle already boots off SD natively!
+DISABLE_SD_BOOT="yes"
+
diff --git a/packages/apt/apt-0.6.46/.mtn2git_empty b/packages/apt/apt-0.6.46.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/apt/apt-0.6.46/.mtn2git_empty
+++ b/packages/apt/apt-0.6.46.2/.mtn2git_empty
diff --git a/packages/apt/apt-0.6.46/autofoo.patch b/packages/apt/apt-0.6.46.2/autofoo.patch
index 74d787cefd..74d787cefd 100644
--- a/packages/apt/apt-0.6.46/autofoo.patch
+++ b/packages/apt/apt-0.6.46.2/autofoo.patch
diff --git a/packages/apt/apt-0.6.46/noconfigure.patch b/packages/apt/apt-0.6.46.2/noconfigure.patch
index 682a96da24..682a96da24 100644
--- a/packages/apt/apt-0.6.46/noconfigure.patch
+++ b/packages/apt/apt-0.6.46.2/noconfigure.patch
diff --git a/packages/apt/apt-0.6.46/nodoc.patch b/packages/apt/apt-0.6.46.2/nodoc.patch
index 9101847189..9101847189 100644
--- a/packages/apt/apt-0.6.46/nodoc.patch
+++ b/packages/apt/apt-0.6.46.2/nodoc.patch
diff --git a/packages/apt/apt-native_0.6.46.bb b/packages/apt/apt-native_0.6.46.2.bb
index 43f73889f7..43f73889f7 100644
--- a/packages/apt/apt-native_0.6.46.bb
+++ b/packages/apt/apt-native_0.6.46.2.bb
diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb
new file mode 100644
index 0000000000..1cd8eb270e
--- /dev/null
+++ b/packages/apt/apt_0.6.46.2.bb
@@ -0,0 +1,9 @@
+require apt.inc
+
+SRC_URI += "file://autofoo.patch;patch=1 \
+ file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
diff --git a/packages/apt/apt_0.6.46.bb b/packages/apt/apt_0.6.46.bb
deleted file mode 100644
index 6d21638118..0000000000
--- a/packages/apt/apt_0.6.46.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-require apt.inc
-
-require apt-package.inc
-
-FILES_${PN} += "${bindir}/apt-key"
-apt-manpages += "doc/apt-key.8"
-
-do_install () {
- set -x
- ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
- ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
- install -d ${D}${bindir}
- install -m 0755 bin/apt-cdrom ${D}${bindir}/
- install -m 0755 bin/apt-get ${D}${bindir}/
- install -m 0755 bin/apt-config ${D}${bindir}/
- install -m 0755 bin/apt-cache ${D}${bindir}/
-
- install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
- install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
-
- eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
- oe_libinstall -a -C bin libapt-pkg ${D}${libdir}/
- ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
- oe_libinstall -a -C bin libapt-inst ${D}${libdir}/
- ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
-
- install -d ${D}${libdir}/apt/methods
- install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
-
- install -d ${D}${libdir}/dpkg/methods/apt
- install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
- install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/
- install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/
- install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/
- install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/
-
- install -d ${D}${sysconfdir}/apt
- install -d ${D}${localstatedir}/lib/apt/lists/partial
- install -d ${D}${localstatedir}/cache/apt/archives/partial
- install -d ${D}${docdir}/apt/examples
- install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
-}
-
diff --git a/packages/base-files/base-files/h5xxx/.mtn2git_empty b/packages/base-files/base-files/h5000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/base-files/base-files/h5xxx/.mtn2git_empty
+++ b/packages/base-files/base-files/h5000/.mtn2git_empty
diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5000/fstab
index b44d7eacee..b44d7eacee 100644
--- a/packages/base-files/base-files/h5xxx/fstab
+++ b/packages/base-files/base-files/h5000/fstab
diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb
index d980ea35ca..b757354c8e 100644
--- a/packages/esound/esound-gpe_20020817.bb
+++ b/packages/esound/esound-gpe_20020817.bb
@@ -7,7 +7,7 @@ PROVIDES += "esound"
RPROVIDES += "esound"
SRCDATE = "${PV}"
-SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base/;module=esound;date=20061119 \
file://audiofile-please.patch;patch=1 \
file://configure.patch;patch=1"
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index 12b4e3d857..bc739d3f0f 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
@@ -5,7 +5,7 @@ PR = "r0"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
index 649704ba08..b936a4ad64 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
@@ -6,7 +6,7 @@ PR = "r2"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index cf508cb720..3b1c1a073d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -6,7 +6,7 @@ PR = "r1"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
index 6c80c4405a..21e3c18534 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
KERNEL_CCSUFFIX = "-3.3.4"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig
index b3f8f7c100..b3f8f7c100 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index ca2f2486a9..0dfdd4cf81 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h
LICENSE = "GPL"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)'
+COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|simpad)'
# SRC_URI *must* be overriden in includer, but this is a good reference
SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/tslib/tslib/h5xxx/.mtn2git_empty b/packages/linux/mx21ads-kernel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/h5xxx/.mtn2git_empty
+++ b/packages/linux/mx21ads-kernel/.mtn2git_empty
diff --git a/packages/linux/mx21ads-kernel/mx21ads_defconfig b/packages/linux/mx21ads-kernel/mx21ads_defconfig
new file mode 100644
index 0000000000..ba54ea2484
--- /dev/null
+++ b/packages/linux/mx21ads-kernel/mx21ads_defconfig
@@ -0,0 +1,1180 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-rc5
+# Wed Nov 15 22:33:25 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-csb"
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+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=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+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 is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+CONFIG_FAMILY_IMX=y
+# 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
+# CO