ppc44x: use the mtdsplit framework for the Taishan
[openwrt.git] / target / linux / ppc44x / patches-3.18 / 100-openwrt_flashmap.patch
1 --- a/arch/powerpc/boot/dts/taishan.dts
2 +++ b/arch/powerpc/boot/dts/taishan.dts
3 @@ -194,16 +194,12 @@
4                                         #address-cells = <1>;
5                                         #size-cells = <1>;
6                                         partition@0 {
7 -                                               label = "kernel";
8 -                                               reg = <0x0 0x180000>;
9 +                                               label = "firmware";
10 +                                               reg = <0x0 0x3e00000>;
11                                         };
12 -                                       partition@180000 {
13 -                                               label = "root";
14 -                                               reg = <0x180000 0x200000>;
15 -                                       };
16 -                                       partition@380000 {
17 -                                               label = "user";
18 -                                               reg = <0x380000 0x3bc0000>;
19 +                                       partition@3e00000 {
20 +                                               label = "diagnostics";
21 +                                               reg = <0x3e00000 0x140000>;
22                                         };
23                                         partition@3f40000 {
24                                                 label = "env";
25 --- a/arch/powerpc/boot/dts/canyonlands.dts
26 +++ b/arch/powerpc/boot/dts/canyonlands.dts
27 @@ -222,24 +222,12 @@
28                                         #address-cells = <1>;
29                                         #size-cells = <1>;
30                                         partition@0 {
31 -                                               label = "kernel";
32 -                                               reg = <0x00000000 0x001e0000>;
33 -                                       };
34 -                                       partition@1e0000 {
35 -                                               label = "dtb";
36 -                                               reg = <0x001e0000 0x00020000>;
37 +                                               label = "kernel+dtb";
38 +                                               reg = <0x00000000 0x00200000>;
39                                         };
40                                         partition@200000 {
41 -                                               label = "ramdisk";
42 -                                               reg = <0x00200000 0x01400000>;
43 -                                       };
44 -                                       partition@1600000 {
45 -                                               label = "jffs2";
46 -                                               reg = <0x01600000 0x00400000>;
47 -                                       };
48 -                                       partition@1a00000 {
49 -                                               label = "user";
50 -                                               reg = <0x01a00000 0x02560000>;
51 +                                               label = "rootfs";
52 +                                               reg = <0x00200000 0x03d60000>;
53                                         };
54                                         partition@3f60000 {
55                                                 label = "env";