summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-03-02 11:12:28 +0000
committerRichard Purdie <rpurdie@rpsys.net>2005-03-02 11:12:28 +0000
commit9311565f41cf533fb774c703f7f5c10e92315d9c (patch)
treee3dfeca4de01f24ff6303d25115d0c12c7b6e309 /packages/linux
parent50ba532e37360807de1712e4bbac9cc95ee8f780 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded 2005/03/02 11:12:07+00:00 rpsys.net!RP openzaurus-2.6: Tosa updates from Dirk Opfer BKrev: 42259f9cR1JBRaau02UFGlnBbAFDsw
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus_2.6.11-rc5.bb32
1 files changed, 16 insertions, 16 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11-rc5.bb b/packages/linux/linux-openzaurus_2.6.11-rc5.bb
index 4285669b0e..a0cfa6d246 100644
--- a/packages/linux/linux-openzaurus_2.6.11-rc5.bb
+++ b/packages/linux/linux-openzaurus_2.6.11-rc5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r1"
+PR = "r2"
DOSRC="http://www.do13.in-berlin.de/openzaurus"
RPSRC="http://www.rpsys.net/openzaurus/patches"
@@ -61,28 +61,29 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.10.tar.gz \
${RPSRC}/w100_split5-r0.patch;patch=1 \
${RPSRC}/pxa_rtc-r0.patch;patch=1 \
${RPSRC}/pxa_irda-r0.patch;patch=1 \
- ${DOSRC}/tc6393-device-r1.patch;patch=1 \
- ${DOSRC}/tc6393_nand-r1.patch;patch=1 \
- ${DOSRC}/tosa-machine-base-r1.patch;patch=1 \
- ${DOSRC}/tosa-keyboard-r1.patch;patch=1 \
- ${DOSRC}/tc6393fb-r0.patch;patch=1 \
- ${DOSRC}/tosa-power-r0.patch;patch=1 \
+ ${DOSRC}/tc6393-device-r2.patch;patch=1 \
+ ${DOSRC}/tc6393_nand-r2.patch;patch=1 \
+ ${DOSRC}/tosa-machine-base-r2.patch;patch=1 \
+ ${DOSRC}/tosa-keyboard-r2.patch;patch=1 \
+ ${DOSRC}/tc6393fb-r1.patch;patch=1 \
+ ${DOSRC}/tosa-power-r1.patch;patch=1 \
+ ${DOSRC}/sharpsl-flash-tosa-r0.patch;patch=1 \
+ ${RPSRC}/sharp_multi_pcmcia-r0.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-collie \
file://defconfig-poodle \
file://defconfig-tosa "
SRC_URI_append_collie = " ${RPSRC}/jl1/collie_keymap.patch;patch=1 "
-SRC_URI_append_c7x0 = " ${RPSRC}/sharp_multi_pcmcia-r0.patch;patch=1 "
SRC_URI_append_tosa = " ${RPSRC}/corgi_power1-r0.patch;patch=1 \
${DOSRC}/nand-readid-r0.patch;patch=1 \
- ${DOSRC}/tosa-pcmia-r0.patch;patch=1 \
- ${DOSRC}/tosa-mmc-r0.patch;patch=1 \
- ${DOSRC}/tosa-bl-r0.patch;patch=1 \
- ${DOSRC}/tosa-udc-r0.patch;patch=1 \
- ${DOSRC}/pxa-ac97-hh.org-r0.patch;patch=1 \
- ${DOSRC}/tosa-ac97-r0.patch;patch=1 "
-# ${DOSRC}/multiple-scoop-devices-r1.patch;patch=1
+ ${DOSRC}/tosa-mmc-r1.patch;patch=1 \
+ ${DOSRC}/tosa-bl-r1.patch;patch=1 \
+ ${DOSRC}/tosa-udc-r1.patch;patch=1 \
+ ${DOSRC}/tosa-irda-r0.patch;patch=1 \
+ ${DOSRC}/ac97-r0.patch;patch=1 "
+# ${DOSRC}/tosa-pcmia-r0.patch;patch=1
+
S = "${WORKDIR}/linux-2.6.10"
@@ -109,7 +110,6 @@ COMPATIBLE_HOST = "arm.*-linux"
CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
-CMDLINE_ROOT_tosa = "root=/dev/mtdblock1 rootfstype=jffs2 "
##############################################################
# Configure memory/ramdisk split for collie