1 --- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
2 +++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
6 stdout-path = "serial0:115200n8";
7 + append-rootblock = "nullparameter="; /* override the bootloader args */
15 + nvmem-cells = <&macaddr_vendor_0>;
16 + nvmem-cell-names = "mac-address";
21 gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
26 + compatible = "mtd-concat";
28 + devices = <&mtd_kernel &mtd_gap &mtd_gap2>;
31 + compatible = "fixed-partitions";
32 + #address-cells = <1>;
36 + compatible = "openwrt,uimage", "denx,uimage";
46 reg = <0>; /* Chip select 0 */
47 spi-max-frequency = <20000000>;
52 - * Synology u-boot uses its compiled-in environment
53 - * and it seems Synology did not care to change u-boot
54 - * default configuration in order to allow saving a
55 - * modified environment at a sensible location. So,
56 - * if you do a 'saveenv' under u-boot, your modified
57 - * environment will be saved at 1MB after the start
58 - * of the flash, i.e. in the middle of the uImage.
59 - * For that reason, it is strongly advised not to
60 - * change the default environment, unless you know
61 - * what you are doing.
63 - partition@0 { /* u-boot */
65 - reg = <0x00000000 0x000c0000>; /* 768KB */
68 + compatible = "fixed-partitions";
70 - partition@c0000 { /* uImage */
72 - reg = <0x000c0000 0x002d0000>; /* 2880KB */
74 + partition@0 { /* u-boot */
76 + reg = <0x00000000 0x000c0000>; /* 768KB */
80 - partition@390000 { /* uInitramfs */
82 - reg = <0x00390000 0x00440000>; /* 4250KB */
84 + mtd_gap: partition@c0000 { /* gap */
86 + reg = <0x000c0000 0x00040000>; /* 256KB */
89 - partition@7d0000 { /* MAC address and serial number */
91 - reg = <0x007d0000 0x00010000>; /* 64KB */
93 + partition@100000 { /* u-boot-env */
94 + label = "u-boot-env";
95 + reg = <0x00100000 0x00010000>; /* 64KB */
99 - label = "RedBoot config";
100 - reg = <0x007e0000 0x00010000>; /* 64KB */
102 + mtd_kernel: partition@110000 {
104 + reg = <0x00110000 0x006c0000>; /* 6912KB */
108 - label = "FIS directory";
109 - reg = <0x007f0000 0x00010000>; /* 64KB */
110 + partition@7d0000 { /* MAC address and serial number */
111 + reg = <0x007d0000 0x00010000>; /* 64KB */
115 + compatible = "nvmem-cells";
118 + compatible = "fixed-layout";
119 + #address-cells = <1>;
122 + macaddr_vendor_0: macaddr@0 {
128 + mtd_gap2: partition@7e0000 {
130 + reg = <0x007e0000 0x00020000>; /* 128KB */