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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/08/24 17:37:36+02:00 uni-frankfurt.de!mickey
misc. fixes for beagle

BKrev: 412b60d3aie5yS-RXcFvA5n_QRmaPA

diff --git a/conf/beagle.conf b/conf/beagle.conf
index db22f07..d43c504 100644 (file)
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -13,7 +13,7 @@ kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor "
 
 #kernel-module-gpio kernel-module-registers
 
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000"
 
 include conf/handheld-common.conf
 include conf/tune-strongarm.conf

diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index db7aa56..9a53d46 100644 (file)
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -184,7 +184,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 CONFIG_APM=y
 # CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="noinitrd root=/dev/mtdblock/1 init=/linuxrc mem=27M console=ttySA0"
+CONFIG_CMDLINE="<see .oe file>"
 CONFIG_LEDS=y
 CONFIG_LEDS_TIMER=y
 # CONFIG_LEDS_CPU is not set

diff --git a/linux/montavista-sa-2.4.17-mvl21/flash-for-beagle-iii.patch b/linux/montavista-sa-2.4.17-mvl21/flash-for-beagle-iii.patch
index e69de29..5da237f 100644 (file)
--- a/linux/montavista-sa-2.4.17-mvl21/flash-for-beagle-iii.patch
+++ b/linux/montavista-sa-2.4.17-mvl21/flash-for-beagle-iii.patch
@@ -0,0 +1,21 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-2.4.17_mvl21/drivers/mtd/maps/sa1100-flash.c~flash-for-beagle-iii.patch
++++ linux-2.4.17_mvl21/drivers/mtd/maps/sa1100-flash.c
+@@ -184,12 +184,7 @@
+       },
+       {
+               name: "root",
+-              //size: 0x01E80000,
+-              // for III
+-              //size: 0x01AC0000,
+-              // for III TimKang modified 20040112
+-              //size: 0x017C0000,
+-              size: 0x015C0000,
++              size: 0x00EC0000,
+               offset: MTDPART_OFS_APPEND,
+       },
+       {

diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index fe006e2..24eb347 100644 (file)
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 MVLV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
-PR = "r2"
+PR = "r4"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/montavista-sa-${PV}"
 
@@ -21,6 +21,8 @@ S = "${WORKDIR}/linux-${KV}_${MVLV}"
 
 inherit kernel
 
+CMDLINE="noinitrd root=/dev/mtdblock/1 mem=27M console=ttySA0"
+
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
@@ -28,6 +30,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 EXTRA_OEMAKE = ""
 
 do_configure_prepend() {
-        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+       install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+       echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }