Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/16 00:57:08+02:00 uni-frankfurt.de!mickey
clean up 2.6.5 .oe file and apply Richard Purdie's patch
until one of those guys update our official zaurus kernel tree at openzaurus.bkbits.net (hint, hint)

BKrev: 40cf7ed5J8yoI5uOs50YNVFqwWSu9g

3 files changed, 33 insertions, 24 deletions

diff --git a/linux/openzaurus-2.6.5-jl3/defconfig-husky b/linux/openzaurus-2.6.5-jl3/defconfig-husky
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/openzaurus-2.6.5-jl3/defconfig-husky
diff --git a/linux/openzaurus-2.6.5-jl3/patch-2.6.5-rp1.diff b/linux/openzaurus-2.6.5-jl3/patch-2.6.5-rp1.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/openzaurus-2.6.5-jl3/patch-2.6.5-rp1.diff
diff --git a/linux/openzaurus_2.6.5-jl3.oe b/linux/openzaurus_2.6.5-jl3.oe
index 49d9cfbd66..8162ad942d 100644
--- a/linux/openzaurus_2.6.5-jl3.oe
+++ b/linux/openzaurus_2.6.5-jl3.oe
@@ -4,44 +4,53 @@ KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
            http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${PV}.diff.gz;patch=1 \
+           file://patch-2.6.5-rp1.diff;patch=1 \
            file://defconfig-collie \
-           file://defconfig-shepherd"
+           file://defconfig-shepherd \
+           file://defconfig-husky"
 S = "${WORKDIR}/linux-${KV}"
 
 inherit kernel
 
-KERNEL_CCSUFFIX = "-3.3.3"
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1 
+        
+EXTRA_OEMAKE = ""
 COMPATIBLE_HOST = "arm.*-linux"
+KERNEL_CCSUFFIX = "-3.3.3"
 
 #FIXME: Use configuration system
 export MEM = "32"
 export RD = "32"
 export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
-EXTRA_OEMAKE = ""
+export CMDLINEpxa = "console=ttyS0,9600n8 9600n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
 
 do_configure() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 
-        mem=${MEM}
-        rd=${RD}
-        mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
-        rdsize=`echo "$rd * 1024" | bc`
-        total=`expr $mem + $rd`
-        addr=`echo "obase=16; ibase=16; C000000 + $mempos" | bc`
-        if [ "$rd" == "0" ]
-        then
-                echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
-        else
-                echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
-                echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
-                echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
-                echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
-        fi
-	echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
+        if [ "${MACHINE}" == "collie" ]
+	then
+		mem=${MEM}
+		rd=${RD}
+		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+		rdsize=`echo "$rd * 1024" | bc`
+		total=`expr $mem + $rd`
+		addr=`echo "obase=16; ibase=16; C000000 + $mempos" | bc`
+	 	if [ "$rd" == "0" ]
+	 	then
+			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+		else
+			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
+			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
+			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
+		fi
+		echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
+	else
+		echo "CONFIG_CMDLINE=\"$CMDLINEpxa"" >> ${S}/.config
+	fi
         oe_runmake oldconfig
 }
-
-do_compile() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake
-}