From: Imre Kaloz <kaloz@openwrt.org>
Date: Sat, 23 Jul 2011 20:44:08 +0000 (+0000)
Subject: upgrade to 3.0
X-Git-Tag: reboot~16198
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=commitdiff_plain;h=193845ce7a5cdcba128155618236179de595cfd8

upgrade to 3.0

SVN-Revision: 27738
---

diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index b13261a9d2..95f1ee631c 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs
 CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=2.6.32.33
+LINUX_VERSION:=3.0
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index fffead2f87..bec21b5825 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -25,6 +25,7 @@ CONFIG_BITREVERSE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOKE=y
 CONFIG_BOUNCE=y
+# CONFIG_BLUESTONE is not set
 CONFIG_CANYONLANDS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CLASSIC_RCU=y
diff --git a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch b/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch
deleted file mode 100644
index 5a240de9e3..0000000000
--- a/target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/arch/powerpc/boot/dts/canyonlands.dts
-+++ b/arch/powerpc/boot/dts/canyonlands.dts
-@@ -262,28 +262,6 @@
- 				interrupts = <0x1 0x4>;
- 			};
- 
--			UART2: serial@ef600500 {
--				device_type = "serial";
--				compatible = "ns16550";
--				reg = <0xef600500 0x00000008>;
--				virtual-reg = <0xef600500>;
--				clock-frequency = <0>; /* Filled in by U-Boot */
--				current-speed = <0>; /* Filled in by U-Boot */
--				interrupt-parent = <&UIC1>;
--				interrupts = <0x1d 0x4>;
--			};
--
--			UART3: serial@ef600600 {
--				device_type = "serial";
--				compatible = "ns16550";
--				reg = <0xef600600 0x00000008>;
--				virtual-reg = <0xef600600>;
--				clock-frequency = <0>; /* Filled in by U-Boot */
--				current-speed = <0>; /* Filled in by U-Boot */
--				interrupt-parent = <&UIC1>;
--				interrupts = <0x1e 0x4>;
--			};
--
- 			IIC0: i2c@ef600700 {
- 				compatible = "ibm,iic-460ex", "ibm,iic";
- 				reg = <0xef600700 0x00000014>;
diff --git a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch
index 592e64cdcf..225831a4b6 100644
--- a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch
+++ b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch
@@ -25,7 +25,7 @@
  						label = "env";
 --- a/arch/powerpc/boot/dts/canyonlands.dts
 +++ b/arch/powerpc/boot/dts/canyonlands.dts
-@@ -187,24 +187,12 @@
+@@ -217,24 +217,12 @@
  					#address-cells = <1>;
  					#size-cells = <1>;
  					partition@0 {