diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-24 15:37:55 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-24 15:37:55 +0000 |
| commit | b6a43db5e8402c9aca50f664798d7575c14ecfc3 (patch) | |
| tree | 8ae255c44bd71636f4a5fe78bb40174c6aef3099 /linux | |
| parent | 9b40376a1187aae065f8798bc51da0e46afeb9e4 (diff) | |
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
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/montavista-sa-2.4.17-mvl21/defconfig-beagle | 2 | ||||
| -rw-r--r-- | linux/montavista-sa-2.4.17-mvl21/flash-for-beagle-iii.patch | 21 | ||||
| -rw-r--r-- | linux/montavista-sa_2.4.17-mvl21.oe | 7 |
3 files changed, 27 insertions, 3 deletions
diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle index db7aa56142..9a53d46eb2 100644 --- 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 e69de29bb2..5da237ff1a 100644 --- 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 fe006e2813..24eb347d4e 100644 --- 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 } |