OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 13... Line 13...
13   13  
14 chosen { 14 chosen {
15 bootargs = "console=ttyS0,57600"; 15 bootargs = "console=ttyS0,57600";
Line 16... Line 16...
16 }; 16 };
17   17  
-   18 gpio-keys-polled {
-   19 compatible = "gpio-keys-polled";
18 keys { 20 #address-cells = <1>;
Line 19... Line 21...
19 compatible = "gpio-keys-polled"; 21 #size-cells = <0>;
20 poll-interval = <20>; 22 poll-interval = <20>;
21   23  
Line 32... Line 34...
32 }; 34 };
Line 33... Line 35...
33   35  
34 &nand { 36 &nand {
Line 35... Line -...
35 status = "okay"; -  
36   -  
37 partitions { -  
38 compatible = "fixed-partitions"; -  
39 #address-cells = <1>; -  
40 #size-cells = <1>; 37 status = "okay";
41   38  
42 partition@0 { 39 partition@0 {
43 label = "u-boot"; 40 label = "u-boot";
44 reg = <0x0 0x80000>; 41 reg = <0x0 0x80000>;
Line 45... Line 42...
45 read-only; 42 read-only;
46 }; 43 };
47   44  
48 partition@80000 { 45 partition@80000 {
49 label = "u-boot-env"; 46 label = "u-boot-env";
Line 50... Line 47...
50 reg = <0x80000 0x60000>; 47 reg = <0x80000 0x60000>;
51 read-only; 48 read-only;
52 }; 49 };
53   50  
Line 54... Line 51...
54 factory: partition@e0000 { 51 factory: partition@e0000 {
55 label = "factory"; 52 label = "factory";
56 reg = <0xe0000 0x60000>; 53 reg = <0xe0000 0x60000>;
57 }; 54 };
Line 58... Line 55...
58   55  
59 partition@140000 { 56 partition@140000 {
60 label = "kernel1"; 57 label = "kernel1";
61 reg = <0x140000 0x300000>; 58 reg = <0x140000 0x300000>;
Line 62... Line 59...
62 }; 59 };
63   60  
64 partition@440000 { 61 partition@440000 {
65 label = "kernel2"; -  
66 reg = <0x440000 0x300000>; 62 label = "kernel2";
67 }; 63 reg = <0x440000 0x300000>;
Line 68... Line 64...
68   64 };
69 partition@740000 { 65  
Line 81... Line 77...
81 }; 77 };
82 }; 78 };
83 }; 79 };
Line 84... Line 80...
84   80  
85 &spi0 { -  
86 /* 81 &spi0 {
87 * This board has 2Mb spi flash soldered in and visible 82 /* This board has 2Mb spi flash soldered in and visible
88 * from manufacturer's firmware. 83 from manufacturer's firmware.
89 * But this SoC shares spi and nand pins, 84 But this SoC shares spi and nand pins,
90 * and current driver doesn't handle this sharing well -  
91 */ 85 and current driver does't handle this sharing well */
Line 92... Line 86...
92 status = "disabled"; 86 status = "disabled";
-   87  
-   88 m25p80@0 {
93   89 #address-cells = <1>;
94 m25p80@1 { 90 #size-cells = <1>;
95 compatible = "jedec,spi-nor"; 91 compatible = "jedec,spi-nor";
-   92 reg = <1>;
Line 96... Line -...
96 reg = <1>; -  
97 spi-max-frequency = <10000000>; -  
98   -  
99 partitions { -  
100 compatible = "fixed-partitions"; -  
101 #address-cells = <1>; 93 spi-max-frequency = <10000000>;
102 #size-cells = <1>; 94 m25p,chunked-io = <32>;
103   95  
104 partition@0 { 96 partition@0 {
105 label = "spi"; -  
106 reg = <0x0 0x200000>; 97 label = "spi";
107 read-only; 98 reg = <0x0 0x200000>;
108 }; 99 read-only;
Line 109... Line 100...
109 }; 100 };