merge of b40b9fb8b17f69ba321fa34167b8ddb37dc72ec2

     and e6a2ccb39d3b001fdcc1071ba1860678a1fe8647

1 files changed, 34 insertions, 23 deletions

diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 74edea8df8..cdc5898be7 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -2,8 +2,9 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
 SECTION = "kernel"
 MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-RPROVIDES = "virtual/kernel-hostap"
+
+PACKAGES += "kernel-module-hostap"
+RPROVIDES_kernel-module-hostap = "hostap-modules"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
@@ -25,7 +26,6 @@ COMPATIBLE_HOST = "arm.*-linux"
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
 CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw"
-CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw"
 CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 
@@ -38,7 +38,6 @@ export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
 CMDLINE_MEM_collie = "mem=${mem}M"
 CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
 CMDLINE_ROTATE_akita = "fbcon=rotate:1"
-CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
 CMDLINE_ROTATE_collie = "fbcon=rotate:1"
 CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
 CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
@@ -55,19 +54,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
 module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
-module_autoload_snd-soc-spitz_borzoi = "snd-soc-spitz"
 module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
 
 do_configure() {
+	rm -f ${S}/.config
 
-	case ${MACHINE} in
-		akita | spitz | borzoi )
-			install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available."
-			;;
-        	*)
-			install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-			;;
-	esac
+	if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then
+		die "No default configuration for ${MACHINE} available."
+	fi
 
 	if [ "${MACHINE}" == "collie" ]; then
 		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
@@ -89,24 +83,41 @@ do_configure() {
 
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
-	if [ "${ENABLE_ELPP}" == "yes" ]; then
-                echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
-                echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
-                echo "CONFIG_LOGO=y"                    >> ${S}/.config
-                echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
-	else
-		echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
+	#if [ "${ENABLE_ELPP}" == "yes" ]; then
+        #        echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
+        #        echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
+        #        echo "CONFIG_LOGO=y"                    >> ${S}/.config
+        #        echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
+	#else
+	#	echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
+	#fi
+
+	if [ "${TARGET_OS}" == "linux-gnueabi" ]; 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_AEABI/d' \
+	    -e '/CONFIG_OABI_COMPAT=/d' \
+	    -e '/CONFIG_CMDLINE=/d' \
+	    -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \
+	    -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
+	    -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
+	    -e '/CONFIG_MTDRAM_ABS_POS=/d' \
+	    '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config'
+
 	yes '' | oe_runmake oldconfig
 }
 
-# Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii
+# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii
 do_compile_append() {
 	case ${MACHINE} in
-		c7x0 | akita | poodle | spitz | borzoi | tosa )
+		c7x0 | akita | poodle | spitz | tosa )
 			size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-			if [ $size -ge 1302000 ]; then	
+			if [ $size -ge 1294336 ]; then	
 				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 				echo "Size is $size"
 				die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular."