lantiq: use uniform "u-boot-env" mtd label

This is the most popular choice in the linux kernel tree.

Within OpenWrt, this change will establish consistency with ath79
and ramips targets.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
[extend commit message, include netgear_dm200, update base-files]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/package/boot/uboot-envtools/files/lantiq b/package/boot/uboot-envtools/files/lantiq
index f4541a559bdc4b1557e0ab6b312155893dfee8f7..87dfac8b3012837e786738aa9ccfd8dfe6234acc 100644 (file)
--- a/package/boot/uboot-envtools/files/lantiq
+++ b/package/boot/uboot-envtools/files/lantiq
@@ -26,7 +26,7 @@ zyxel,p-2812hnu-f1)
        ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x2000" "0x20000" "1"
        ;;
 buffalo,wbmr-300hpd)
-       idx="$(find_mtd_index ubootconfig)"
+       idx="$(find_mtd_index u-boot-env)"
        [ -n "$idx" ] && \
                ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x2000" "0x1000" "2"
        ;;

diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
index 0bda3e47638060b8b7ad68480cf428f9f6573b09..deddba2408c6ad5726a11e2a121883ce6c1bb906 100755 (executable)
--- a/target/linux/lantiq/ase/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
@@ -37,7 +37,7 @@ lantiq_setup_macs()
 
        case "$board" in
        allnet,all0333cj)
-               lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+               lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
        esac

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index c5dd1600f4f6d303c5a31772eb7a977efe38fbc5..8bb3e3cbd8d6c893a39c9989e122883ecba6a76c 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -96,7 +96,7 @@
                        };
 
                        partition@3ff200 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x3ff200 0xc00>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 044ae2b417a24589d73c34182b344db2e73e1248..9c1ebf42f0814ac31ad691ca87d4740a1d50b505 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -148,7 +148,7 @@
                                read-only;
                        };
                        partition@64000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x64000 0x004000>;
                        };
                        ath9k_cal: partition@68000 {

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 5419215dc63501c58a0df6de73bc5f67bed85197..98ce11c250d7ad7540d72d82afbd39cd78730d63 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -162,7 +162,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index a3dbbbdfadb2e996bfb03994a370d775e83755cd..64fae44e7f9891371dc35f51e8851831dae0c580 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -158,7 +158,7 @@
 
                        partition@10000 {
                                reg = <0x10000 0x10000>;
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                read-only;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index 9b640e03272801b2f37202ea84c889cebeec0b8c..95df8ed04834966a461a7eb1a47545e37d3ee964 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
@@ -148,7 +148,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 267788319cca07595342ad5b7a0bd1b7a47d2c29..81ce539930cafb80d848ade071dfd32e19f4b069 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
@@ -144,7 +144,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
index 19a44d5f6ddb2f07eb7bca863b96a6caf6f2eb44..89a7adcd6c7035f7ccbb1e379e50fdd211427042 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
@@ -178,7 +178,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
index dcae06d8942a209eb32848bf23fd3fec3f4a9ae7..39e02d072cbc4c04cd6bcf1286cdfbc045c2ec4c 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
@@ -145,7 +145,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>; /* 64 KB */
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 8e5301ddc908e83c4f2d6c38b46aa5ba9204d2ee..42eb12c80b6847a4f9ae47e7fc147dbc1943cb40 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -155,7 +155,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index b59477cb19c4c9f93addfa66c9d7f1d7423a7f77..02ec8705af9fe92680a740cc3de27e4b4b32a50a 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -167,7 +167,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index cceb42164ebb791af4808bd910854ffbdf2313ef..b1c1b8be8ec2b195a8fb071413ebeb52aa10b961 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -116,7 +116,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index eecff4bb0bfb3cf6aaa0551b550a6540395a4f50..096180ac9d9b57d0c36a03021ecc04f463ca6c45 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -185,7 +185,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 9e4216033beb170f1d5612ff30c9608170318339..854648ddc33b60fb243fe4f149a05c1299265d51 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -123,7 +123,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index 063be778d4fc19a4d613d76cb83e3694ea409fd7..b48559d3cd57f8b7d8bc2bfec8f9e864293c7d2e 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -140,7 +140,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index b5e88455765355249bb3e97b8fa25d2344debbe3..3f4112318d910c203da7365323abe875ab849b7a 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -172,7 +172,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 34b541af9299daf1d6f4e9571f74c628101fc923..79019b635b074fe5217ea3f4e50a8bd33847a0f4 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -167,7 +167,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index d673c9b204a32d53ad91478b062e1be514108099..c0749761555f5e3ec31b0e5a862eb34a24b5ea4c 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -109,7 +109,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 5db5f314d972fd396b252e751ccb8780a1b109a4..a3cb132019259dd7cba74eff48b85f894ab9b32d 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -179,7 +179,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index ec90a2bef9aa6d7a8dd6d14e5f37923e92ed5ffd..60fd8bb918b00aa92115c00f7cc237da7398470b 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -192,7 +192,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
index 67b0f9631f29b4d849880b167a09608bf16a0f9e..f40d278411143bf93fe77b129ab3a2363fd04ef4 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
@@ -62,7 +62,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x20000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 40886feec4a9d76819b4b22075518b903d84ecc1..9f2d8ec336844a68a5621d17ff757e8b561269d2 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -154,7 +154,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x10000>; /* 64KB */
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
index 1afc74900e47c4cef52ad6cae67f4da553b11aef..cba2d7eb84be00c22c70d3d6972da8ebffa01385 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
@@ -49,7 +49,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>; /* 64 KB */
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
index 0072f7e2b16c24ea1b2a3f6b2fe664ae2e302e4c..4a023d1e3fde7977e3744d5c2215467b5081ab2c 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
@@ -77,7 +77,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
index 2107da5435c85015c8f23364abc9aa993d99f9f3..d2f5c8c16a3c1841fe8a83f9cb4ba47fe5e8319b 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
@@ -27,7 +27,7 @@
                };
 
                partition@10000 {
-                       label = "uboot_env";
+                       label = "u-boot-env";
                        reg = <0x40000 0x40000>;
                };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
index 56d0fe0bc3384c3828f97ae54acf36f609d31cb1..5e4084f24ea6b0f89891b1c81b491adece681e3f 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
@@ -28,7 +28,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x40000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
index b35f70b64609d083fcffafb9ac3195fa360c3422..f741ea2b7b6831639e00945722ff37400d9e3c9e 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
@@ -24,7 +24,7 @@
 
                        partition@40000 {
                                reg = <0x40000 0x80000>;
-                               label = "uboot_env";
+                               label = "u-boot-env";
                        };
 
                        partition@c0000 {

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index 3d10f582b01fcbdb0e08d09f6778883f21d6425c..b9be5d55d2a6815e2b6cae8f773ccb5caec67541 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
@@ -136,7 +136,7 @@
                        };
 
                        partition@30000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index d6c521cfe7e0f9132fc24cd583f48344d71d4191..8a4a694c40423880f810d7bac42f02e80c3574c9 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -203,7 +203,7 @@
                        };
 
                        partition@60000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index e074147d66e7d243574b072bd3d20a40e1c9f706..ba1a01e36f0a72c95db829b74d9be7d4f6076bf4 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -136,7 +136,7 @@
                        };
 
                        partition@7f0000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x7f0000 0x10000>;
                        };
                };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
index 613ff3782c472cdfe5426c3ee3a768a26c8422ae..bbe3b0ed4769e91fca5d033e49d6eb663d65c604 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
@@ -17,7 +17,7 @@
                        };
 
                        partition@60000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x20000>; /* 128 KiB */
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
index 2121fbf41d6c63d38cb14f91cb21bf1f8cb1f390..e9606e19a22e177dc1cce9827adbb054a4e8fb36 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
@@ -16,7 +16,7 @@
                                read-only;
                        };
                        partition@60000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index f6a2d9f6a786f9867666df15dc2c798bb5aeec59..a506b7dd13013b09a503b254b38a35ee786956ad 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -242,7 +242,7 @@
                                read-only;
                        };
                        partition@a0000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0xa0000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 4631ad4ffe0ec3b94ba54ae813568c2d878ac0dc..61be0ca2ef54b00465b9cbadf617bf4f35480f95 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
@@ -281,7 +281,7 @@
 
                        partition@ff0000 {
                                reg = <0xff0000 0x2000>;
-                               label = "ubootconfig";
+                               label = "u-boot-env";
                        };
 
                        partition@ff3000 {

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
index 585521459be66ad67a51b8a0d18aa288bf49a15b..7a7ab1cd4339fcf74428f4345cc0c08f7e149958 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
@@ -33,7 +33,7 @@
                        };
 
                        partition@100000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x100000 0x40000>; /* 256 KB */
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
index c204c5e0931accbf9a5147b619b2eb84ac5eb39f..004ce6f000411e9ed405c7a00c1cdaf39d15449e 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
@@ -24,7 +24,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index cdba656e49fdd1aedbbf123f8731cd34c82bcf01..d6dd5edfe4049fd50aa9fe3d40869ee91ef6ddce 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -160,7 +160,7 @@
 
                        partition@7f0000 {
                                reg = <0x7f0000 0x2000>;
-                               label = "ubootconfig";
+                               label = "u-boot-env";
                                read-only;
                        };
 

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index 4d7aac325b2e90ecd44c78023d29dcfc658bebc3..fc19468f77bc3fd3221a294ae6055956047d1b18 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -43,7 +43,7 @@
                                reg = <0x00000 0x40000>;
                        };
                        partition@40000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                        };
                        partition@60000 {

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
index 7da153380998ec3c0b6ab417272c3d9ffefb020f..46a813785763af6f9b10fe449105f8e7b27dd23c 100644 (file)
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
@@ -35,7 +35,7 @@
                                read-only;
                        };
                        partition@50000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x50000 0x10000>;
                        };
                        partition@60000 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index c5dd1600f4f6d303c5a31772eb7a977efe38fbc5..8bb3e3cbd8d6c893a39c9989e122883ecba6a76c 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -96,7 +96,7 @@
                        };
 
                        partition@3ff200 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x3ff200 0xc00>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 044ae2b417a24589d73c34182b344db2e73e1248..9c1ebf42f0814ac31ad691ca87d4740a1d50b505 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -148,7 +148,7 @@
                                read-only;
                        };
                        partition@64000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x64000 0x004000>;
                        };
                        ath9k_cal: partition@68000 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 5419215dc63501c58a0df6de73bc5f67bed85197..98ce11c250d7ad7540d72d82afbd39cd78730d63 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -162,7 +162,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index a3dbbbdfadb2e996bfb03994a370d775e83755cd..64fae44e7f9891371dc35f51e8851831dae0c580 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -158,7 +158,7 @@
 
                        partition@10000 {
                                reg = <0x10000 0x10000>;
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                read-only;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index 9b640e03272801b2f37202ea84c889cebeec0b8c..95df8ed04834966a461a7eb1a47545e37d3ee964 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
@@ -148,7 +148,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 267788319cca07595342ad5b7a0bd1b7a47d2c29..81ce539930cafb80d848ade071dfd32e19f4b069 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
@@ -144,7 +144,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
index 19a44d5f6ddb2f07eb7bca863b96a6caf6f2eb44..89a7adcd6c7035f7ccbb1e379e50fdd211427042 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
@@ -178,7 +178,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
index 3ed49e4a62ff5a1e71b78f3c6086bc0efb072873..48fe88fea82b82708bad0691de44944e4cc591a3 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
@@ -145,7 +145,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>; /* 64 KB */
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 8e5301ddc908e83c4f2d6c38b46aa5ba9204d2ee..42eb12c80b6847a4f9ae47e7fc147dbc1943cb40 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -155,7 +155,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index b59477cb19c4c9f93addfa66c9d7f1d7423a7f77..02ec8705af9fe92680a740cc3de27e4b4b32a50a 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -167,7 +167,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index fb240b2ed8426382d706827055227e145a461f38..ac0af44a90ca3de2e103fa63a71ab81bd361d85e 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -116,7 +116,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index eecff4bb0bfb3cf6aaa0551b550a6540395a4f50..096180ac9d9b57d0c36a03021ecc04f463ca6c45 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -185,7 +185,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 9e4216033beb170f1d5612ff30c9608170318339..854648ddc33b60fb243fe4f149a05c1299265d51 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -123,7 +123,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index 063be778d4fc19a4d613d76cb83e3694ea409fd7..b48559d3cd57f8b7d8bc2bfec8f9e864293c7d2e 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -140,7 +140,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index 5afc157036d28264c3605ec8279d24addac7d4b9..e0e47681bf16a468673ed61e7cfe41382103c3cc 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -172,7 +172,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 34b541af9299daf1d6f4e9571f74c628101fc923..79019b635b074fe5217ea3f4e50a8bd33847a0f4 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -167,7 +167,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index 437fecec9d5e3d56eb9d0b8406d365db0afe9f6a..fd92ed49c9f7db34860eee5ee9cd58299404f9bd 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -109,7 +109,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 5db5f314d972fd396b252e751ccb8780a1b109a4..a3cb132019259dd7cba74eff48b85f894ab9b32d 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -179,7 +179,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index ec90a2bef9aa6d7a8dd6d14e5f37923e92ed5ffd..60fd8bb918b00aa92115c00f7cc237da7398470b 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -192,7 +192,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
index 67b0f9631f29b4d849880b167a09608bf16a0f9e..f40d278411143bf93fe77b129ab3a2363fd04ef4 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts
@@ -62,7 +62,7 @@
                        };
 
                        partition@20000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x20000 0x20000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 40886feec4a9d76819b4b22075518b903d84ecc1..9f2d8ec336844a68a5621d17ff757e8b561269d2 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -154,7 +154,7 @@
                        };
 
                        partition@40000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x10000>; /* 64KB */
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
index 1afc74900e47c4cef52ad6cae67f4da553b11aef..cba2d7eb84be00c22c70d3d6972da8ebffa01385 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts
@@ -49,7 +49,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>; /* 64 KB */
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
index 0072f7e2b16c24ea1b2a3f6b2fe664ae2e302e4c..4a023d1e3fde7977e3744d5c2215467b5081ab2c 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
@@ -77,7 +77,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
index 13f9f82b1a8a35f9d75471141e5394c0327e40cc..06f5110bce19db0fa67394c70f73dd593419d9af 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts
@@ -26,7 +26,7 @@
                };
 
                partition@10000 {
-                       label = "uboot_env";
+                       label = "u-boot-env";
                        reg = <0x40000 0x40000>;
                };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
index 56d0fe0bc3384c3828f97ae54acf36f609d31cb1..5e4084f24ea6b0f89891b1c81b491adece681e3f 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts
@@ -28,7 +28,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x40000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
index 688b7da44c20eca2a957010ea8a727d0ad709c04..2ed15a8dd2ff631549417c7cc3eefd245b89bf1a 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi
@@ -23,7 +23,7 @@
 
                        partition@40000 {
                                reg = <0x40000 0x80000>;
-                               label = "uboot_env";
+                               label = "u-boot-env";
                        };
 
                        partition@c0000 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index 3d10f582b01fcbdb0e08d09f6778883f21d6425c..b9be5d55d2a6815e2b6cae8f773ccb5caec67541 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
@@ -136,7 +136,7 @@
                        };
 
                        partition@30000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x30000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 793818471973c307e29d7311440f66e73225f18c..d9cdf22349ed86ca2259ce059899c5530e31dd2f 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -203,7 +203,7 @@
                        };
 
                        partition@60000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index e074147d66e7d243574b072bd3d20a40e1c9f706..ba1a01e36f0a72c95db829b74d9be7d4f6076bf4 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -136,7 +136,7 @@
                        };
 
                        partition@7f0000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x7f0000 0x10000>;
                        };
                };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
index 613ff3782c472cdfe5426c3ee3a768a26c8422ae..bbe3b0ed4769e91fca5d033e49d6eb663d65c604 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts
@@ -17,7 +17,7 @@
                        };
 
                        partition@60000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x20000>; /* 128 KiB */
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
index 2121fbf41d6c63d38cb14f91cb21bf1f8cb1f390..e9606e19a22e177dc1cce9827adbb054a4e8fb36 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts
@@ -16,7 +16,7 @@
                                read-only;
                        };
                        partition@60000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x60000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index f6a2d9f6a786f9867666df15dc2c798bb5aeec59..a506b7dd13013b09a503b254b38a35ee786956ad 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -242,7 +242,7 @@
                                read-only;
                        };
                        partition@a0000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0xa0000 0x20000>;
                                read-only;
                        };

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 7709a86e5540710ccd9bac3503f961f21226d99d..410992d518c9f50b42502407160ed707af851e19 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
@@ -281,7 +281,7 @@
 
                        partition@ff0000 {
                                reg = <0xff0000 0x2000>;
-                               label = "ubootconfig";
+                               label = "u-boot-env";
                        };
 
                        partition@ff3000 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
index 585521459be66ad67a51b8a0d18aa288bf49a15b..7a7ab1cd4339fcf74428f4345cc0c08f7e149958 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts
@@ -33,7 +33,7 @@
                        };
 
                        partition@100000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x100000 0x40000>; /* 256 KB */
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
index c204c5e0931accbf9a5147b619b2eb84ac5eb39f..004ce6f000411e9ed405c7a00c1cdaf39d15449e 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts
@@ -24,7 +24,7 @@
                        };
 
                        partition@10000 {
-                               label = "uboot_env";
+                               label = "u-boot-env";
                                reg = <0x10000 0x10000>;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index cdba656e49fdd1aedbbf123f8731cd34c82bcf01..d6dd5edfe4049fd50aa9fe3d40869ee91ef6ddce 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -160,7 +160,7 @@
 
                        partition@7f0000 {
                                reg = <0x7f0000 0x2000>;
-                               label = "ubootconfig";
+                               label = "u-boot-env";
                                read-only;
                        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index 4d7aac325b2e90ecd44c78023d29dcfc658bebc3..fc19468f77bc3fd3221a294ae6055956047d1b18 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -43,7 +43,7 @@
                                reg = <0x00000 0x40000>;
                        };
                        partition@40000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x40000 0x20000>;
                        };
                        partition@60000 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
index 7da153380998ec3c0b6ab417272c3d9ffefb020f..46a813785763af6f9b10fe449105f8e7b27dd23c 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
@@ -35,7 +35,7 @@
                                read-only;
                        };
                        partition@50000 {
-                               label = "uboot-env";
+                               label = "u-boot-env";
                                reg = <0x50000 0x10000>;
                        };
                        partition@60000 {

diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
index 53312882539fbd65c75d7df945d2a9aca5ce6861..07bcdf9f845519d8ba4948c6fb5fe2729ab45364 100755 (executable)
--- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
@@ -101,8 +101,8 @@ lantiq_setup_macs()
 
        case "$board" in
        alphanetworks,asl56026)
-               lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-               wan_mac=$(mtd_get_mac_ascii uboot_env wanmac)
+               lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
+               wan_mac=$(mtd_get_mac_ascii u-boot-env wanmac)
                ;;
        arcadyan,arv7519rw22)
                wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1)
@@ -112,7 +112,7 @@ lantiq_setup_macs()
        lantiq,easy80920-nor|\
        zyxel,p-2812hnu-f1|\
        zyxel,p-2812hnu-f3)
-               lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
+               lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
        arcadyan,vgv7510kw22-brn|\
@@ -145,7 +145,7 @@ lantiq_setup_macs()
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
        buffalo,wbmr-300hpd)
-               lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
+               lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
                wan_mac="$lan_mac"
                ;;
        netgear,dm200)

diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network
index 54ace3989ce9010db59160bbc1cd466c7630119e..9813b62c1bfc07d53c19481203316c03ce51083c 100755 (executable)
--- a/target/linux/lantiq/xway/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network
@@ -90,7 +90,7 @@ lantiq_setup_macs()
        bt,homehub-v3a|\
        netgear,dgn3500|\
        netgear,dgn3500b)
-               lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
+               lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
                wan_mac=$(macaddr_add "$lan_mac" 1)
                ;;
        arcadyan,arv7506pw11)

diff --git a/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
index 1f12da8553688f69477c744b4ac7bdc7b2bd9f8d..9aea4eed64707d24c73e463fb551bec22178c876 100644 (file)
--- a/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
+++ b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
@@ -39,11 +39,11 @@ case "$FIRMWARE" in
                                ;;
                        bt,homehub-v3a)
                                caldata_extract_swap "art-copy" 0x0 0x1000
-                               ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot_env ethaddr) +2) 0x10c
+                               ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) 0x10c
                                ;;
                        netgear,dgn3500|netgear,dgn3500b)
                                caldata_extract "calibration" 0xf000 0x1000
-                               ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot-env ethaddr) +2) 0x20c
+                               ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) 0x20c
                                ;;
                        avm,fritz7312|avm,fritz7320)
                                caldata_extract "urlader" 0x985 0x1000