linux-rp: 2.6.22-rc6 -> 2.6.22-rc7, fix defconfig entries, add patch to fix suspend...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2073 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/connectplus-remove-ide-HACK.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-akita b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-akita
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-bootcdx86
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-c7x0
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-collie b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-collie
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-hx2000
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-poodle
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemuarm
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-qemux86
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
similarity index 98%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-spitz
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
index fb81164c0bd4bfee0d73d0b74c67be357dc7666b..11cad5c9110f298a4186c61ebcacc8a7f1c1acbe 100644 (file)
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.22-rc6
-# Sun Jul  1 18:49:40 2007
+# Sun Jul  1 22:44:06 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -707,8 +707,24 @@ CONFIG_NETDEV_10000=y
 #
 # Wireless LAN
 #
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+CONFIG_WLAN_PRE80211=y
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_WLAN_80211=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_LIBERTAS is not set
+CONFIG_HERMES=m
+# CONFIG_ATMEL is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_CS=m
 
 #
 # USB Network Adapters

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/defconfig-tosa
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/hostap-monitor-mode.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/pxa-serial-hack.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/squashfs3.0-2.6.15.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch

diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc6/wm97xx-lcdnoise-r0.patch
rename to meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch

diff --git a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc6.bb b/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
similarity index 97%
rename from meta/packages/linux/linux-rp_2.6.21+2.6.22-rc6.bb
rename to meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
index 902494a49f42d6670ad4ed91be1d1e62b5839abc..12881c869ccbfb0aeb3a00ed64a70241c386140a 100644 (file)
--- a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc6.bb
+++ b/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r0"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,7 +16,7 @@ DEFAULT_PREFERENCE = "-1"
 # 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.21.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc6.bz2;patch=1 \
+           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2;patch=1 \
            ${RPSRC}/lzo_kernel-r3.patch;patch=1 \
            ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \
            ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
@@ -29,7 +29,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/tsc2101-r16.patch;patch=1 \
            ${RPSRC}/hx2750_test1-r6.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/input_power-r8.patch;patch=1 \
+           ${RPSRC}/input_power-r9.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
@@ -40,6 +40,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
            ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \
+           ${RPSRC}/pxa_cken_fixes-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 \