upgrade ppc44x to 2.6.28.2, add basic support for the AMCC Canyonlands

[openwrt.git] / target / linux / ppc44x / patches / 001-taishan_openwrt_flashmap.patch

diff --git a/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
index dc3abd7..b0201fb 100644 (file)
--- a/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
+++ b/target/linux/ppc44x/patches/001-taishan_openwrt_flashmap.patch
@@ -1,39 +1,25 @@
-Index: linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts
-===================================================================
---- linux-2.6.24.7.orig/arch/powerpc/boot/dts/taishan.dts
-+++ linux-2.6.24.7/arch/powerpc/boot/dts/taishan.dts
-@@ -175,6 +175,34 @@
-                               interrupt-parent = <&UIC1>;
- 
-                               /* TODO: Add other EBC devices */
-+                              nor_flash@0,0 {
-+                                      compatible = "cfi-flash";
-+                                      bank-width = <4>;
-+                                      device-width = <2>;
-+                                      reg = <0 000000 4000000>;
-+                                      #address-cells = <1>;
-+                                      #size-cells = <1>;
-+                                      partition@0 {
-+                                              label = "kernel";
-+                                              reg = <0 200000>;
-+                                      };
+--- a/arch/powerpc/boot/dts/taishan.dts
++++ b/arch/powerpc/boot/dts/taishan.dts
+@@ -195,15 +195,15 @@
+                                       #size-cells = <1>;
+                                       partition@0 {
+                                               label = "kernel";
+-                                              reg = <0x0 0x180000>;
++                                              reg = <0x0 0x200000>;
+                                       };
+-                                      partition@180000 {
+-                                              label = "root";
+-                                              reg = <0x180000 0x200000>;

 +                                      partition@200000 {
 +                                              label = "rootfs";
 +                                      partition@200000 {
 +                                              label = "rootfs";

-+                                              reg = <200000 3c00000>;
-+                                      };
++                                              reg = <0x200000 0x3c00000>;
+                                       };
+-                                      partition@380000 {
+-                                              label = "user";
+-                                              reg = <0x380000 0x3bc0000>;

 +                                      partition@3e00000 {
 +                                              label = "diagnostics";
 +                                      partition@3e00000 {
 +                                              label = "diagnostics";

-+                                              reg = <3e00000 140000>;
-+                                      };
-+                                      partition@3f40000 {
-+                                              label = "env";
-+                                              reg = <3f40000 80000>;
-+                                      };
-+                                      partition@3fc0000 {
-+                                              label = "u-boot";
-+                                              reg = <3fc0000 40000>;
-+                                      };
-+                              };
-                       };
- 
- 
++                                              reg = <0x3e00000 0x140000>;
+                                       };
+                                       partition@3f40000 {
+                                               label = "env";