7 files changed, 3 insertions, 72 deletions
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 955344344a..82905dd089 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -11,16 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 #don't try to access tty1
 USE_VT = "0"
 
-
-
-#ship in rootfs:
-EP93XX_MODULES = "kernel-module-apm \
-                  kernel-module-pcmcia-core \
-                  kernel-module-ipv6 "
-
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "57600 ttyAM0"
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index a4a6af1f71..d6b3c70454 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" 
 
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
deleted file mode 100644
index dc8b8478a7..0000000000
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-LICENSE = "GPL"
-#
-COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3600|simpad|jornada56x)'
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26"
-
-S = "${WORKDIR}/kernel26"
-PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-
-K_MAJOR = "2"
-K_MINOR = "6"
-K_MICRO = "12"
-HHV     = "0"
-
-inherit kernel
-#
-PAKCAGE_ARCH = "ipaqsa"
-PACKAGE_ARCH_jornada56x = "jornada56x"
-PACKAGE_ARCH_jornada7xx = "jornada7xx"
-PACKAGE_ARCH_simpad     = "simpad"
-
-do_configure() {
-	install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config || die "No default configuration for ${MACHINE} available."
-        (echo N; echo m; echo N) | oe_runmake oldconfig
-}
diff --git a/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb b/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb
deleted file mode 100644
index b81129eff9..0000000000
--- a/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Handhelds HTC-PXA phones kernel based on the hh 2.6.16"
-LICENSE = "GPL"
-PR="r0"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=K2-6-16-hh4"
-
-S = "${WORKDIR}/kernel26"
-
-COMPATIBLE_HOST = "arm.*-linux"
-
-inherit kernel
-
-do_configure() {
-        cp arch/arm/configs/htcuniversal_defconfig .config || die "No default configuration for ${MACHINE} available."
-        yes '' | oe_runmake oldconfig
-}
-
-
-###############################################################
-# put into deploy directory
-#
-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
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 5535e91c48..8c62e59973 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|h3900|h4000|h5xxx|htcuniversal|hx4700)'
+COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-sa-2.6/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/jornada56x/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-sa-2.6/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/jornada56x/.mtn2git_empty
diff --git a/packages/linux/handhelds-sa-2.6/defconfig-jornada56x b/packages/linux/linux-handhelds-2.6/jornada56x/defconfig
index ebc9a88f2c..ebc9a88f2c 100644
--- a/packages/linux/handhelds-sa-2.6/defconfig-jornada56x
+++ b/packages/linux/linux-handhelds-2.6/jornada56x/defconfig