Skip to content
Snippets Groups Projects
Commit e2b03c16 authored by Filip Matijević's avatar Filip Matijević Committed by Adrian Schmutzler
Browse files

ipq806x: add missing enclosing partitions block for TP-Link C2600


The partitions that have compatible property set are skipped by mtd if
they are not contained inside a partitions node and this breaks
fetching MAC address from "default-mac" partition.

Fix this by defining all the partitions inside partitions node with
compatible = "fixed-partitions" as nvmem requires the standard
partitions scheme to work correctly.

Fixes: FS#3945
Fixes: cd36d716 ("ipq806x/dts: Add Archer C2600 DTS")
Fixes: 0458a899 ("ipq806x: convert mtd-mac-address to nvmem
implementation")

Signed-off-by: default avatarFilip Matijević <filip.matijevic.pz@gmail.com>
Reviewed-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
[adjust commit title/message]
Signed-off-by: default avatarAdrian Schmutzler <freifunk@adrianschmutzler.de>
parent d37125b3
No related branches found
No related tags found
No related merge requests found
...@@ -82,152 +82,158 @@ ...@@ -82,152 +82,158 @@
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
reg = <0>; reg = <0>;
partition@0 { partitions {
label = "SBL1"; compatible = "fixed-partitions";
reg = <0x0 0x20000>; #address-cells = <1>;
read-only; #size-cells = <1>;
};
partition@0 {
partition@20000 { label = "SBL1";
label = "MIBIB"; reg = <0x0 0x20000>;
reg = <0x20000 0x20000>; read-only;
read-only; };
};
partition@20000 {
partition@40000 { label = "MIBIB";
label = "SBL2"; reg = <0x20000 0x20000>;
reg = <0x40000 0x20000>; read-only;
read-only; };
};
partition@40000 {
partition@60000 { label = "SBL2";
label = "SBL3"; reg = <0x40000 0x20000>;
reg = <0x60000 0x30000>; read-only;
read-only; };
};
partition@60000 {
partition@90000 { label = "SBL3";
label = "DDRCONFIG"; reg = <0x60000 0x30000>;
reg = <0x90000 0x10000>; read-only;
read-only; };
};
partition@90000 {
partition@a0000 { label = "DDRCONFIG";
label = "SSD"; reg = <0x90000 0x10000>;
reg = <0xa0000 0x10000>; read-only;
read-only; };
};
partition@a0000 {
partition@b0000 { label = "SSD";
label = "TZ"; reg = <0xa0000 0x10000>;
reg = <0xb0000 0x30000>; read-only;
read-only; };
};
partition@b0000 {
partition@e0000 { label = "TZ";
label = "RPM"; reg = <0xb0000 0x30000>;
reg = <0xe0000 0x20000>; read-only;
read-only; };
};
partition@e0000 {
partition@100000 { label = "RPM";
label = "fs-uboot"; reg = <0xe0000 0x20000>;
reg = <0x100000 0x70000>; read-only;
read-only; };
};
partition@100000 {
partition@170000 { label = "fs-uboot";
label = "uboot-env"; reg = <0x100000 0x70000>;
reg = <0x170000 0x40000>; read-only;
read-only; };
};
partition@170000 {
partition@1b0000 { label = "uboot-env";
label = "radio"; reg = <0x170000 0x40000>;
reg = <0x1b0000 0x40000>; read-only;
read-only; };
};
partition@1b0000 {
partition@1f0000 { label = "radio";
label = "os-image"; reg = <0x1b0000 0x40000>;
reg = <0x1f0000 0x400000>; read-only;
}; };
partition@5f0000 { partition@1f0000 {
label = "rootfs"; label = "os-image";
reg = <0x5f0000 0x1900000>; reg = <0x1f0000 0x400000>;
}; };
defaultmac: partition@1ef0000 { partition@5f0000 {
label = "default-mac"; label = "rootfs";
reg = <0x1ef0000 0x00200>; reg = <0x5f0000 0x1900000>;
read-only; };
};
defaultmac: partition@1ef0000 {
partition@1ef0200 { label = "default-mac";
label = "pin"; reg = <0x1ef0000 0x00200>;
reg = <0x1ef0200 0x00200>; read-only;
read-only; };
};
partition@1ef0200 {
partition@1ef0400 { label = "pin";
label = "product-info"; reg = <0x1ef0200 0x00200>;
reg = <0x1ef0400 0x0fc00>; read-only;
read-only; };
};
partition@1ef0400 {
partition@1f00000 { label = "product-info";
label = "partition-table"; reg = <0x1ef0400 0x0fc00>;
reg = <0x1f00000 0x10000>; read-only;
read-only; };
};
partition@1f00000 {
partition@1f10000 { label = "partition-table";
label = "soft-version"; reg = <0x1f00000 0x10000>;
reg = <0x1f10000 0x10000>; read-only;
read-only; };
};
partition@1f10000 {
partition@1f20000 { label = "soft-version";
label = "support-list"; reg = <0x1f10000 0x10000>;
reg = <0x1f20000 0x10000>; read-only;
read-only; };
};
partition@1f20000 {
partition@1f30000 { label = "support-list";
label = "profile"; reg = <0x1f20000 0x10000>;
reg = <0x1f30000 0x10000>; read-only;
read-only; };
};
partition@1f30000 {
partition@1f40000 { label = "profile";
label = "default-config"; reg = <0x1f30000 0x10000>;
reg = <0x1f40000 0x10000>; read-only;
read-only; };
};
partition@1f40000 {
partition@1f50000 { label = "default-config";
label = "user-config"; reg = <0x1f40000 0x10000>;
reg = <0x1f50000 0x40000>; read-only;
read-only; };
};
partition@1f50000 {
partition@1f90000 { label = "user-config";
label = "qos-db"; reg = <0x1f50000 0x40000>;
reg = <0x1f90000 0x40000>; read-only;
read-only; };
};
partition@1f90000 {
partition@1fd0000 { label = "qos-db";
label = "usb-config"; reg = <0x1f90000 0x40000>;
reg = <0x1fd0000 0x10000>; read-only;
read-only; };
};
partition@1fd0000 {
partition@1fe0000 { label = "usb-config";
label = "log"; reg = <0x1fd0000 0x10000>;
reg = <0x1fe0000 0x20000>; read-only;
read-only; };
partition@1fe0000 {
label = "log";
reg = <0x1fe0000 0x20000>;
read-only;
};
}; };
}; };
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment