diff options
author | Richard Purdie <richard@openedhand.com> | 2007-06-26 23:03:45 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-06-26 23:03:45 +0000 |
commit | ec0ee0bec9c45d1c983cc97f2da4f71cac770e41 (patch) | |
tree | 329687291087588c971b4ed4970b899a7d0e4675 /meta/packages/linux/linux-rp_2.6.20.bb | |
parent | 8689ce9ada86d66337dcd7dc54bc58e318912fac (diff) | |
download | openembedded-core-ec0ee0bec9c45d1c983cc97f2da4f71cac770e41.tar.gz openembedded-core-ec0ee0bec9c45d1c983cc97f2da4f71cac770e41.tar.bz2 openembedded-core-ec0ee0bec9c45d1c983cc97f2da4f71cac770e41.tar.xz openembedded-core-ec0ee0bec9c45d1c983cc97f2da4f71cac770e41.zip |
linux-rp: Sync up/cleanup with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2014 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-rp_2.6.20.bb')
-rw-r--r-- | meta/packages/linux/linux-rp_2.6.20.bb | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/meta/packages/linux/linux-rp_2.6.20.bb b/meta/packages/linux/linux-rp_2.6.20.bb index fee29dfd3..b818b0f3e 100644 --- a/meta/packages/linux/linux-rp_2.6.20.bb +++ b/meta/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r7" +PR = "r19" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -14,6 +14,7 @@ PR = "r7" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ + http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch;patch=1;status=merged \ ${RPSRC}/oprofile_always_bt_arm-r0.patch;patch=1 \ ${RPSRC}/lzo_kernel-r0.patch;patch=1 \ @@ -39,6 +40,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ + ${RPSRC}/w100_extmem-r0.patch;patch=1 \ file://hostap-monitor-mode.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ @@ -52,12 +54,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \ + file://sharpsl-rc-r1.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-hx2000 \ file://defconfig-collie \ file://defconfig-poodle \ file://defconfig-akita \ - file://defconfig-spitz \ + file://defconfig-spitz* \ file://defconfig-qemuarm \ file://defconfig-qemux86 \ file://defconfig-tosa " @@ -74,14 +77,21 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) + SRC_URI_append_collie = "\ - ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \ - ${DOSRC}/collie/collie-r0.patch;patch=1 \ - ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \ - ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \ - file://collie-mcp-r1.patch;patch=1 \ - ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \ -# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \ + ${TKSRC}/mtd-sharp-flash-hack-r2.patch;patch=1 \ + ${TKSRC}/ucb1x00-touch-audio-r1.patch;patch=1 \ + ${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \ + ${TKSRC}/sa1100-udc-r2.patch;patch=1 \ + ${TKSRC}/mmc_spi-r4.patch;patch=1 \ + ${TKSRC}/locomo-r0.patch;patch=1 \ + ${TKSRC}/collie-kexec.patch;patch=1 \ + ${TKSRC}/locomo_spi-r3.patch;patch=1 \ + ${TKSRC}/sharpsl_pm.patch;patch=1 \ + ${TKSRC}/collie_pm-2.patch;patch=1 \ + ${TKSRC}/locomokeyb_suspendkey.patch;patch=1 \ + ${TKSRC}/pcmcia_suspend.patch;patch=1 \ + ${TKSRC}/ucb1x00_suspend.patch;patch=1 \ " SRC_URI_append_tosa = "\ |