- catch up with new attribute scoping in kernel .oe files

- add 2.4.21-rmk2-jpm0 to the pile of SIMpad kernels

BKrev: 4076e542v2Lxv8uUTBvQahQfK_saNQ

12 files changed, 210 insertions, 14 deletions

diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/2.4.21-rmk2-jpm0.patch b/linux/opensimpad-2.4.21-rmk2-jpm0/2.4.21-rmk2-jpm0.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/2.4.21-rmk2-jpm0.patch
diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/defconfig-simpad b/linux/opensimpad-2.4.21-rmk2-jpm0/defconfig-simpad
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/defconfig-simpad
diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/initsh.patch b/linux/opensimpad-2.4.21-rmk2-jpm0/initsh.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/initsh.patch
diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/mkdep.patch b/linux/opensimpad-2.4.21-rmk2-jpm0/mkdep.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/mkdep.patch
diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/scrolling-area.patch b/linux/opensimpad-2.4.21-rmk2-jpm0/scrolling-area.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/scrolling-area.patch
diff --git a/linux/opensimpad-2.4.21-rmk2-jpm0/sound-volume-reversed.patch b/linux/opensimpad-2.4.21-rmk2-jpm0/sound-volume-reversed.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad-2.4.21-rmk2-jpm0/sound-volume-reversed.patch
diff --git a/linux/opensimpad_2.4.19-rmk7-jpm2.oe b/linux/opensimpad_2.4.19-rmk7-jpm2.oe
index e69de29bb2..dce56a356b 100644
--- a/linux/opensimpad_2.4.19-rmk7-jpm2.oe
+++ b/linux/opensimpad_2.4.19-rmk7-jpm2.oe
@@ -0,0 +1,71 @@
+DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PN = "linux"
+LICENSE = "GPL"
+KV = "2.4.19"
+RMKV = "rmk7"
+PXAV = "pxa3"
+JPMV = "jpm2"
+PV = "${KV}-${RMKV}-${JPMV}"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${KV}-${RMKV}-${JPMV}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2                                      \
+           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-${RMKV}.gz;patch=1   \
+           \
+           file://${FILESDIR}/${KV}-${RMKV}-${JPMV}.patch;patch=1     \
+           \
+           file://${FILESDIR}/scrolling-area.patch;patch=1            \
+           file://${FILESDIR}/sound-volume-reversed.patch;patch=1     \
+           \
+           file://${FILESDIR}/iw_handlers.w14-5.diff;patch=1          \
+           file://${FILESDIR}/iw240_we15-6.diff;patch=1               \
+           \
+           file://${FILESDIR}/initsh.patch;patch=1                    \
+           file://${FILESDIR}/mkdep.patch;patch=1"
+
+# apply this when we have a patch that allows building with gcc 3.x:
+# SRC_URI_append = file://${FILESDIR}/gcc-3.3.patch;patch=1
+# SRC_URI_append = file://${FILESDIR}/machtune-args.patch;patch=1
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#FIXME: Use configuration system
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=tty1 root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "
+EXTRA_OEMAKE = ""
+
+do_configure_prepend() {
+        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config
+
+        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
+        oe_runmake oldconfig
+}
+
+do_compile_prepend() {
+        cd ${S}
+        test -f ${S}/.hdepend || touch ${S}/include/linux/version.h
+        oe_runmake dep-files
+        cd ${S}/arch/arm/tools
+        ${MAKE} dep
+        rm -f ${S}/include/linux/version.h
+        cd ${S}
+}
diff --git a/linux/opensimpad_2.4.21-rmk2-jpm0.oe b/linux/opensimpad_2.4.21-rmk2-jpm0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/opensimpad_2.4.21-rmk2-jpm0.oe
diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index e69de29bb2..e9f66589ae 100644
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -0,0 +1,67 @@
+DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PN = "linux"
+LICENSE = "GPL"
+KV = "2.4.25"
+VRSV = "vrs2"
+PXAV = "pxa1"
+JPMV = "jpm1"
+PV = "${KV}-${VRSV}-${PXAV}-${JPMV}"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${KV}-${VRSV}-${PXAV}-${JPMV}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+           file://${FILESDIR}/${KV}-${VRSV}.patch;patch=1                 \
+           file://${FILESDIR}/${KV}-${VRSV}-${PXAV}.patch;patch=1         \
+           file://${FILESDIR}/${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
+           \
+           file://${FILESDIR}/scrolling-area.patch;patch=1                \
+           file://${FILESDIR}/sound-volume-reversed.patch;patch=1         \
+           \
+           file://${FILESDIR}/mkdep.patch;patch=1"
+
+# apply this when we have a patch that allows building with gcc 3.x:
+# SRC_URI_append = file://${FILESDIR}/gcc-3.3.patch;patch=1
+# SRC_URI_append = file://${FILESDIR}/machtune-args.patch;patch=1
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#FIXME: Use configuration system
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "
+EXTRA_OEMAKE = ""
+
+do_configure_prepend() {
+        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config
+
+        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
+        oe_runmake oldconfig
+}
+
+do_compile_prepend() {
+        cd ${S}
+        test -f ${S}/.hdepend || touch ${S}/include/linux/version.h
+        oe_runmake dep-files
+        cd ${S}/arch/arm/tools
+        ${MAKE} dep
+        rm -f ${S}/include/linux/version.h
+        cd ${S}
+}
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index ba52beba30..52dcff00c6 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -33,9 +33,9 @@ S = "${WORKDIR}/linux"
 inherit kernel
 
 #FIXME: Use configuration system
-MEM = "32"
-RD = "32"
-CMDLINE = "root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete"
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "console=ttySA root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete"
 EXTRA_OEMAKE = ""
 
 do_configure_prepend() {
@@ -56,7 +56,7 @@ do_configure_prepend() {
                 echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
                 echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
         fi
-	echo "CONFIG_CMDLINE=\"$CMDLINE console=null mem=${mem}M\"" >> ${S}/.config
+	echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
         oe_runmake oldconfig
 }
 
diff --git a/linux/openzaurus_2.6.4-jl1.oe b/linux/openzaurus_2.6.4-jl1.oe
index e69de29bb2..b2eefb7b3d 100644
--- a/linux/openzaurus_2.6.4-jl1.oe
+++ b/linux/openzaurus_2.6.4-jl1.oe
@@ -0,0 +1,59 @@
+DESCRIPTION = "Linux kernel for Zaurus devices."
+PN = "linux"
+LICENSE = "GPL"
+KV = "2.6.4"
+JLV = "jl1"
+PV = "${KV}-${JLV}"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-${PV}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
+           http://www.cs.wisc.edu/~lenz/zaurus/patch-${KV}-${JLV}.diff.gz;patch=1"
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#FIXME: Use configuration system
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "root=/dev/mtdblock4 console=tty0 rootfstype=jffs2 jffs2_orphand_inodes=delete"
+EXTRA_OEMAKE = ""
+
+do_configure_prepend() {
+        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config
+
+        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
+        oe_runmake oldconfig
+}
+
+#do_compile_prepend() {
+#        cd ${S}
+#        test -f ${S}/.hdepend || touch ${S}/include/linux/version.h
+#        oe_runmake dep-files
+#        cd ${S}/arch/arm/tools
+#        ${MAKE} dep
+#        rm -f ${S}/include/linux/version.h
+#        cd ${S}
+#}
+
+do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake
+}
+
diff --git a/simpad-utilities/genboot/simpad-make-flashimg b/simpad-utilities/genboot/simpad-make-flashimg
index 70818180db..95877f115f 100644
--- a/simpad-utilities/genboot/simpad-make-flashimg
+++ b/simpad-utilities/genboot/simpad-make-flashimg
@@ -9,7 +9,6 @@
 GENBOOT=genboot
 PAD=pad
 KERNEL=$2
-OUTPUT_DIR=$3
 
 doComplete()
 {
@@ -29,8 +28,8 @@ doComplete()
     loader_entry="0xc0208000"
 
     echo "File: $flashfile Exec: $loader_entry $filelen "
-    $GENBOOT -d3 $loader_entry 1 $loader_start $filelen >$OUTPUT_DIR/bheader
-    cat $OUTPUT_DIR/bheader $outfile >$flashfile
+    $GENBOOT -d3 $loader_entry 1 $loader_start $filelen >/tmp/bheader
+    cat /tmp/bheader $outfile >$flashfile
     rm $outfile
     rm $padfile
     exit 0
@@ -50,8 +49,8 @@ doKernel()
     loader_entry="0xc0208000"
 
     echo "File: $flashfile Exec: $loader_entry $filelen "
-    $GENBOOT -d3 $loader_entry 1 $loader_start $filelen >$OUTPUT_DIR/bheader
-    cat $OUTPUT_DIR/bheader $outfile >$flashfile
+    $GENBOOT -d3 $loader_entry 1 $loader_start $filelen >/tmp/bheader
+    cat /tmp/bheader $outfile >$flashfile
     rm $outfile
     exit 0
 }
@@ -70,20 +69,20 @@ doKernelInPlace()
     loader_entry="0xc0080000"
 
     echo "File: $flashfile Exec: $loader_entry $filelen "
-    $GENBOOT $loader_entry 1 $loader_start $filelen >$OUTPUT_DIR/bheader
-    cat $OUTPUT_DIR/bheader $outfile >$flashfile.inplace
+    $GENBOOT $loader_entry 1 $loader_start $filelen >/tmp/bheader
+    cat /tmp/bheader $outfile >$flashfile.inplace
     rm $outfile
     exit 0
 }
 
-if [ $# -lt 3 ]
-    then echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel> <output-dir>" && exit -1
+if [ $# -lt 2 ]
+    then echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel>" && exit -1
 fi
 
 case "$1" in
 kernel) doKernel;;
 complete) doComplete;;
 inplace) doKernelInPlace;;
-*) echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel> <output-dir>"; exit;;
+*) echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel>"; exit;;
 esac