linux-oz-2.6: Update to 2.6.15. Add gcc4 build fix and a better pxa2xx pcmcia patch...
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 10 Jan 2006 02:08:37 +0000 (02:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 02:08:37 +0000 (02:08 +0000)
12 files changed:
packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/.mtn2git_empty with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/add-oz-release-string.patch with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/connectplus-remove-ide-HACK.patch with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0 [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-c7x0 with 99% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-collie [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-collie with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00 [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 with 99% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270 [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-ipaq-pxa270 with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-poodle [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-poodle with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/defconfig-tosa [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-tosa with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/pxa-serial-hack.patch with 100% similarity]
packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch [moved from packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch with 100% similarity]
packages/linux/linux-openzaurus_2.6.15.bb [moved from packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb with 86% similarity]

@@ -492,8 +492,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
@@ -480,8 +480,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
+PR = "r0"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -12,21 +12,17 @@ PR = "r2"
 
 # 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/testing/linux-2.6.15-rc2.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc2-rc3.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc3-rc4.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc4-rc5.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc5-rc6.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc6-rc7.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_ohci-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \
            ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
-           ${RPSRC}/pxa2xx_release-r0.patch;patch=1 \
+           ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
            ${RPSRC}/led_core-r10.patch;patch=1 \
            ${RPSRC}/led_triggers-r8.patch;patch=1 \
@@ -97,7 +93,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
                        ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \
                        ${DOSRC}/wm9712-pm-r0.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.15-rc2"
+S = "${WORKDIR}/linux-2.6.15"
 
 # to get module dependencies working
-KERNEL_RELEASE = "2.6.15-rc7"
+KERNEL_RELEASE = "2.6.15"