diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-08-14 16:40:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-14 16:40:05 +0000 |
| commit | ef4409bc8d3c40b3ba39d2fe4c91e68785bbd419 (patch) | |
| tree | fa9776f473f438140f6ea852e0d12967624a7beb /packages/linux | |
| parent | 1e9f32efa15fcc6649119f0c4c398b3405f6b9c0 (diff) | |
| parent | f3ead211477be5319bbb8cb5a983e6ec68dd2a23 (diff) | |
merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
and d83e77353ac4cf240e630aa66aa54eb794547a60
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz | 6 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz index 02437440c5..ce1f55b0f9 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-rc5-mm1 -# Fri Aug 12 08:40:57 2005 +# Sat Aug 13 23:17:29 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -160,7 +160,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" # CONFIG_XIP_KERNEL is not set # @@ -714,7 +714,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y -# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_CORGI=y # # Speakup console speech diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index fd6dd9ee37..bcc2c13c28 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,10 +79,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r0.patch;patch=1 \ + ${RPSRC}/spitzbase-r1.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r0.patch;patch=1 \ - ${RPSRC}/spitzlcd-r0.patch;patch=1 \ + ${RPSRC}/spitzssp-r1.patch;patch=1 \ + ${RPSRC}/spitzbl-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -110,7 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \ - ${RPSRC}/spitzts-r0.patch;patch=1 " + ${RPSRC}/spitzts-r1.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" |