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

treewide: use more descriptive names for concatenated partitions

Browse Source 
A few devices in ath79 and ramips use mtd-concat to concatenate
individual partitions into a bigger "firmware" or "ubi" partition.

However, the original partitions are still present and visible,
and one can write to them directly although this might break the
actual virtual, concatenated partition.

As we cannot do much about the former, let's at least choose more
descriptive names than just "firmwareX" in order to indicate the
concatenation to the user. He might be less tempted into overwriting
a "fwconcat1" than a "firmware1", which might be perceived as an
alternate firmware for dual boot etc.

This applies the new naming consistently for all relevant devices,
i.e. fwconcatX for virtual "firmware" members and ubiconcatX for
"ubi" members.

While at it, use DT labels and label property consistently, and
also use consistent zero-based indexing.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler
2020-12-20 01:03:36 +01:00
parent ccf65613da
commit 1fb40a72da
13 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
View File

@@ -23,7 +23,7 @@
virtual_flash {
compatible = "mtd-concat";
devices = <&firmware1 &firmware2 &firmware3>;
devices = <&fwconcat0 &fwconcat1 &fwconcat2>;
partitions {
compatible = "fixed-partitions";
@@ -89,8 +89,8 @@
read-only;
};
firmware2: partition@60000 {
label = "firmware2";
fwconcat1: partition@60000 {
label = "fwconcat1";
reg = <0x60000 0x170000>;
};
@@ -99,13 +99,13 @@
reg = <0x1d0000 0x10000>;
};
firmware3: partition@1e0000 {
label = "firmware3";
fwconcat2: partition@1e0000 {
label = "fwconcat2";
reg = <0x1e0000 0x20000>;
};
firmware1: partition@200000 {
label = "firmware1";
fwconcat0: partition@200000 {
label = "fwconcat0";
reg = <0x200000 0x600000>;
};
};

12
target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
View File

@@ -45,14 +45,14 @@
ubi-concat {
compatible = "mtd-concat";
devices = <&ubipart0 &ubipart1>;
devices = <&ubiconcat0 &ubiconcat1>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
ubi@0 {
partition@0 {
label = "ubi";
reg = <0x0 0x79c0000>;
};
@@ -91,8 +91,8 @@
reg = <0x140000 0x400000>;
};
ubipart0: partition@540000 {
label = "ubipart0";
ubiconcat0: partition@540000 {
label = "ubiconcat0";
reg = <0x540000 0x1c80000>;
};
@@ -102,8 +102,8 @@
read-only;
};
ubipart1: partition@2240000 {
label = "ubipart1";
ubiconcat1: partition@2240000 {
label = "ubiconcat1";
reg = <0x2240000 0x5d40000>;
};
};