domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpc85xx: Fix HiveAP-330 nvmem mac loader

Browse Source 
We actually need to enclose the whole section of partitions in a
`partitions { ... }` to assign it a `compatible = "fixed-partitions";
otherwise the partition referred to by `hwinfo` won't be registered
when bringing up MTD partitions, for example as per:

- <https://forum.openwrt.org/t/tp-link-c2600-missing-default-mac-mtd-partition-in-snapshot/103945/6>

- commit e2b03c16eb ("ipq806x: add missing enclosing partitions block for TP-Link C2600")'

Fixes: 8ec21d6bb2 ("mpc85xx: convert mtd-mac-address to nvmem implementation")
Signed-off-by: Martin Kennedy <hurricos@gmail.com>
[minor beautification]
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Martin Kennedy
2021-11-23 19:07:14 -05:00
committed by Christian Lamparter
parent 7c99085bd6
commit 79ceea4303
1 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
View File

@@ -42,64 +42,70 @@
bank-width = <2>;
device-width = <1>;
partition@0 {
reg = <0x0 0x40000>;
label = "dtb";
};
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@40000 {
reg = <0x40000 0x40000>;
label = "initrd";
};
partition@0 {
reg = <0x0 0x40000>;
label = "dtb";
};
partition@80000 {
reg = <0x80000 0x27c0000>;
label = "rootfs";
};
partition@40000 {
reg = <0x40000 0x40000>;
label = "initrd";
};
partition@2840000 {
reg = <0x2840000 0x800000>;
label = "kernel";
};
partition@80000 {
reg = <0x80000 0x27c0000>;
label = "rootfs";
};
partition@3040000 {
reg = <0x3040000 0xec0000>;
label = "stock-jffs2";
read-only;
};
partition@2840000 {
reg = <0x2840000 0x800000>;
label = "kernel";
};
hwinfo: partition@3f00000 {
reg = <0x3f00000 0x20000>;
label = "hw-info";
read-only;
};
partition@3040000 {
reg = <0x3040000 0xec0000>;
label = "stock-jffs2";
read-only;
};
partition@3f20000 {
reg = <0x3f20000 0x20000>;
label = "boot-info";
read-only;
};
hwinfo: partition@3f00000 {
reg = <0x3f00000 0x20000>;
label = "hw-info";
read-only;
};
partition@3f40000 {
reg = <0x3f40000 0x20000>;
label = "boot-info-backup";
read-only;
};
partition@3f20000 {
reg = <0x3f20000 0x20000>;
label = "boot-info";
read-only;
};
partition@3f60000 {
reg = <0x3f60000 0x20000>;
label = "u-boot-env";
};
partition@3f40000 {
reg = <0x3f40000 0x20000>;
label = "boot-info-backup";
read-only;
};
partition@3f80000 {
reg = <0x3f80000 0x80000>;
label = "u-boot";
read-only;
};
partition@3f60000 {
reg = <0x3f60000 0x20000>;
label = "u-boot-env";
};
firmware@0 {
reg = <0x0 0x3040000>;
label = "firmware";
partition@3f80000 {
reg = <0x3f80000 0x80000>;
label = "u-boot";
read-only;
};
firmware@0 {
reg = <0x0 0x3040000>;
label = "firmware";
};
};
};
};