Merge oe-devel@oe-devel.bkbits.net:packages

[openembedded.git] / linux / opensimpad_2.4.25-vrs2-pxa1-jpm1.oe

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index c7e76d5..0bd4a44 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -1,11 +1,12 @@
 DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "kernel"
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 VRSV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
 PXAV = "${@oe.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@oe.data.getVar('PV',d,True).split('-')[3]}"
-PR = "r7"
+PR = "r16"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${PV}"
 
@@ -17,9 +18,15 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
           file://disable-pcmcia-probe.patch;patch=1 \
            file://mkdep.patch;patch=1 \
            file://defconfig-${MACHINE} \
-          ftp://ftp.xs4all.nl/pub/crypto/freeswan/kernpatch/freeswan-2.06.k2.4.patch.gz;patch=1 \
+          http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
            file://mipv6-1.1-v2.4.25.patch;patch=1 \
-           file://simpad-backlight-if.diff;patch=1;pnum=0 "
+           file://simpad-backlight-if.diff;patch=1;pnum=0 \
+           file://simpad-switches-input.diff;patch=1;pnum=0 \
+           file://simpad-switches-input2.diff;patch=1;pnum=0 \
+          file://keymap.patch;patch=1 \
+           file://simpad-apm.diff;patch=1;pnum=0 \
+           file://simpad-ts-noninput.diff;patch=1;pnum=0 \
+           file://simpad-pm-updates.patch;patch=1;pnum=0"
 
 # apply this when we have a patch that allows building with gcc 3.x:
 # SRC_URI_append = file://gcc-3.3.patch;patch=1
@@ -34,7 +41,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 SIMPAD_MEM     = ${@oe.data.getVar("SIMPAD_MEMORY_SIZE",d,1)  or "32"}
 SIMPAD_RD      = ${@oe.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}
-export CMDLINE = ${@oe.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
+export CMDLINE = ${@oe.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
 EXTRA_OEMAKE = ""
 
 module_conf_sa1100_ir = "alias irda0 sa1100_ir"
@@ -47,12 +54,13 @@ do_configure() {
         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`
+        addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
+
         if [ "$rd" == "0" ]
         then
-                echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+                echo "# CONFIG_MTD_MTDRAM is not set" >> ${S}/.config
         else
-                echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+                echo "CONFIG_MTD_MTDRAM=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
@@ -60,4 +68,3 @@ do_configure() {
        echo "CONFIG_CMDLINE=\"${CMDLINE} mem=${mem}M\"" >> ${S}/.config
         oe_runmake oldconfig
 }
-