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