diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-23 20:44:08 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-23 20:44:08 +0000 |
| commit | 2bff5d196282b5d072274a4a8d921f7c09b89e08 (patch) | |
| tree | 3f9fc0431f3e8d6600f825dfe78079d9e3919258 | |
| parent | 670f7774c1efd0b1945374029dbc01189a8eb002 (diff) | |
[ppc44x]: upgrade to 3.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27738 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ppc44x/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ppc44x/config-default | 1 | ||||
| -rw-r--r-- | target/linux/ppc44x/patches/005-canyonlands_remove_nonexisting_uarts.patch | 31 | ||||
| -rw-r--r-- | target/linux/ppc44x/patches/100-openwrt_flashmap.patch | 2 |
4 files changed, 3 insertions, 33 deletions
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index b13261a9d..95f1ee631 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 fffead2f8..bec21b582 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 5a240de9e..000000000 --- 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 592e64cdc..225831a4b 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 { |