merge of '41daabd524e84d8b355abb1ef7c1d06479c25b7d'

     and '749aa1340946e929e3de2422cb6c275ee1ae34ba'

75 files changed, 125301 insertions, 2307 deletions

diff --git a/packages/linux/e680-kernel_2.6.bb b/packages/linux/e680-kernel_2.6.bb
index b3cbfbc0bf..1917275473 100644
--- a/packages/linux/e680-kernel_2.6.bb
+++ b/packages/linux/e680-kernel_2.6.bb
@@ -1,3 +1,2 @@
-MACHINE = "e680"
 COMPATIBLE_MACHINE = "(e680|a780)"
 require linux-ezx_2.6.16.13.bb
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 90d72001d7..28c321e079 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -145,7 +145,8 @@ IXP4XX_PATCHES ?= ""
 SRC_URI  = "${IXP4XX_SRCURI}"
 SRC_URI += "${IXP4XX_PATCHES}"
 
-COMPATIBLE_HOST = 'arm.*-linux'
+COMPATIBLE_HOST = 'arm.*-linux.*'
+COMPATIBLE_MACHINE = '(ixp4xx|loft|nslu2|nas100d|dsmg600|fsg3)'
 
 inherit kernel
 
@@ -197,13 +198,26 @@ do_configure_prepend() {
 	then
 		echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config'
 	fi
-	sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \
+
+        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then               
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config               
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config       
+        else
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi      
+
+        sed     -e '/CONFIG_CPU_BIG_ENDIAN/d' \
+	        -e '/CONFIG_CMDLINE=/d' \
 		-e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \
 		-e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \
 		-e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \
+		-e '/CONFIG_AEABI/d' \
+		-e '/CONFIG_OABI_COMPAT=/d' \
 		'${WORKDIR}/defconfig' >>'${S}/.config'
 	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
 	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
+
 }
 
 # MACHID and LE handling
@@ -253,20 +267,6 @@ pkg_postrm_kernel-image-nslu2 () {
 	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
 }
 
-# The correct settings for the DS101 board:
-ds101_MACHID = "833"
-PACKAGES += "kernel-image-ds101"
-PKG_kernel-image-ds101 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-ds101 = "ds101${ARCH_BYTE_SEX}"
-DESCRIPTION_kernel-image-ds101 = "Linux kernel for the Synology DS101"
-FILES_kernel-image-ds101 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
-pkg_postinst_kernel-image-ds101 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
-}
-pkg_postrm_kernel-image-ds101 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-ds101${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
-}
-
 # The correct settings for Loft:
 loft_MACHID = "849"
 PACKAGES += "kernel-image-loft"
@@ -368,7 +368,6 @@ do_install_append() {
 
 	# Add the machine specific images, with appropriate suffixes
 	install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}'
-	install_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}'
 	install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}'
 	install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}'
 	install_image 'dsmg600${ARCH_BYTE_SEX}' '${dsmg600_MACHID}'
@@ -387,7 +386,6 @@ do_deploy() {
 
 	# And the machine specific images
 	deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}'
-	deploy_image 'ds101${ARCH_BYTE_SEX}' '${ds101_MACHID}'
 	deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}'
 	deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}'
 	deploy_image 'dsmg600${ARCH_BYTE_SEX}' '${dsmg600_MACHID}'
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 7ac7470e82..ba65d600b2 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)'
 
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+# 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('.', '-')} \
            file://24-hostap_cs_id.diff;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
 	   file://defconfig"
@@ -21,10 +22,10 @@ ALLOW_EMPTY_htcuniversal = 1
 
 
 
-K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-HHV     = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
+K_MAJOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+HHV     ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig
index a41c6b6586..8decacd4a2 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17-hh2
-# Fri Oct 27 01:17:24 2006
+# Wed Nov  1 20:06:18 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -1022,22 +1022,27 @@ CONFIG_H2200_BATTERY=y
 #
 # LED devices
 #
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
+# CONFIG_LEDS_H2200 is not set
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
 
 #
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_VIDEO_V4L1 is not set
+# CONFIG_VIDEO_V4L1_COMPAT is not set
 CONFIG_VIDEO_V4L2=y
 
 #
@@ -1049,13 +1054,9 @@ CONFIG_VIDEO_V4L2=y
 #
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_VIVI is not set
-CONFIG_VIDEO_CPIA=m
-# CONFIG_VIDEO_CPIA_USB is not set
 # CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
 
 #
 # Encoders and Decoders
@@ -1073,24 +1074,10 @@ CONFIG_VIDEO_CPIA=m
 #
 # V4L USB devices
 #
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-CONFIG_USB_SN9C102=m
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_ZC0301 is not set
-CONFIG_USB_PWC=m
 
 #
 # Radio Adapters
 #
-# CONFIG_RADIO_MAESTRO is not set
 
 #
 # Digital Video Broadcasting Devices
@@ -1382,27 +1369,7 @@ CONFIG_MMC_SAMCOP=y
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-
-#
-# RTC drivers
-#
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SA1100=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_CLASS is not set
 
 #
 # File systems
diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
index 2ffcc472d4..b614be5124 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
@@ -3,6 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
 LICENSE = "GPL"
 PR = "r1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
 FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16"
 
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://24-hostap_cs_id.diff;patch=1 \
+           file://hrw-pcmcia-ids-r2.patch;patch=1 \
+           file://defconfig"
+
 require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
index 0f1556afaa..dd8ebe2440 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
@@ -3,6 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h
 LICENSE = "GPL"
 PR = "r2"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
 FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16"
 
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://24-hostap_cs_id.diff;patch=1 \
+           file://hrw-pcmcia-ids-r2.patch;patch=1 \
+           file://defconfig"
+
 require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb
index 5f7f88bc21..2c2b9b77a4 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb
@@ -5,4 +5,9 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://24-hostap_cs_id.diff;patch=1 \
+           file://hrw-pcmcia-ids-r2.patch;patch=1 \
+           file://defconfig"
+
 require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index e0aeff7c3f..cd4ab10dd1 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -1,70 +1,18 @@
 SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-PR = "r4"
-#
-COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|hx4700|htcuniversal|magician)'
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
-           file://24-hostap_cs_id.diff;patch=1 \
-           file://hrw-pcmcia-ids-r2.patch;patch=1 \
-	   file://defconfig"
-
-S = "${WORKDIR}/kernel26"
-
-inherit kernel
-
-FILES_kernel-image_hx4700 = ""
-ALLOW_EMPTY_hx4700 = 1
-FILES_kernel-image_htcuniversal = ""
-ALLOW_EMPTY_htcuniversal = 1
+PR = "r5"
 
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "17"
-HHV     = "1"
-#
-
-KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
-do_configure() {
-
-	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
-        	die "-hh version mismatch"
-	fi
-
-	rm -f ${S}/.config
+HHV     = "2"
 
-        if [ ! -e ${WORKDIR}/defconfig ]; then
-                die "No default configuration for ${MACHINE} available."
-        fi
-
-
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
-                echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.