upgrade to 3.0

SVN-Revision: 27738

diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index b13261a9d2ba8055b4117ed87e78be43a9c030f8..95f1ee631cfc03a88f0297191b72cfd7debaa9ad 100644 (file)
--- 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 fffead2f8787e8598f05e978538b20e4f127f579..bec21b58250e3432bb3ce168a40d6eebfe64fdb5 100644 (file)
--- 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 (file)
index 5a240de..0000000
--- 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 592e64cdcf3d9e981e1dd00bbc65b3de48c3d90e..225831a4b6edd2035129f77e178b5dd8317917eb 100644 (file)
--- 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 {