kirkwood: use generic diag.sh
[openwrt/openwrt.git] / target / linux / kirkwood / patches-4.19 / 101-iconnect.patch
1 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
2 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
3 @@ -8,6 +8,13 @@
4 model = "Iomega Iconnect";
5 compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
6
7 + aliases {
8 + led-boot = &led_power_blue;
9 + led-failsafe = &led_power_red;
10 + led-running = &led_power_blue;
11 + led-upgrade = &led_power_red;
12 + };
13 +
14 memory {
15 device_type = "memory";
16 reg = <0x00000000 0x10000000>;
17 @@ -16,8 +23,6 @@
18 chosen {
19 bootargs = "console=ttyS0,115200n8 earlyprintk";
20 stdout-path = &uart0;
21 - linux,initrd-start = <0x4500040>;
22 - linux,initrd-end = <0x4800000>;
23 };
24
25 ocp@f1000000 {
26 @@ -89,12 +94,11 @@
27 gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
28 default-state = "on";
29 };
30 - power-blue {
31 + led_power_blue: power-blue {
32 label = "power:blue";
33 gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
34 - default-state = "keep";
35 };
36 - power-red {
37 + led_power_red: power-red {
38 label = "power:red";
39 gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
40 };
41 @@ -146,28 +150,23 @@
42 status = "okay";
43
44 partition@0 {
45 - label = "uboot";
46 - reg = <0x0000000 0xc0000>;
47 + label = "u-boot";
48 + reg = <0x0000000 0xe0000>;
49 };
50
51 - partition@a0000 {
52 - label = "env";
53 - reg = <0xa0000 0x20000>;
54 + partition@e0000 {
55 + label = "u-boot environment";
56 + reg = <0xe0000 0x100000>;
57 };
58
59 partition@100000 {
60 - label = "zImage";
61 - reg = <0x100000 0x300000>;
62 + label = "second stage u-boot";
63 + reg = <0x100000 0x200000>;
64 };
65
66 - partition@540000 {
67 - label = "initrd";
68 - reg = <0x540000 0x300000>;
69 - };
70 -
71 - partition@980000 {
72 - label = "boot";
73 - reg = <0x980000 0x1f400000>;
74 + partition@200000 {
75 + label = "ubi";
76 + reg = <0x200000 0x1fe00000>;
77 };
78 };
79