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 <[email protected]>
[extend commit message, include netgear_dm200, update base-files]
Signed-off-by: Adrian Schmutzler <[email protected]>

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"
 	;;

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

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;
 			};

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 {

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;
 			};

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;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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>;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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 */
 			};
 

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 */
 			};
 

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>;
 			};
 

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>;
 		};
 

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>;
 			};
 

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 {

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>;
 			};
 

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;
 			};

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>;
 			};
 		};

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;
 			};

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;
 			};

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;
 			};

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 {

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 */
 			};
 

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>;
 			};
 

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;
 			};
 

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 {

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 {

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;
 			};

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 {

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;
 			};

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;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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>;
 			};
 

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;
 			};

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;
 			};

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;
 			};

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>;
 			};
 

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 */
 			};
 

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 */
 			};
 

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>;
 			};
 

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>;
 		};
 

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>;
 			};
 

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 {

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>;
 			};
 

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;
 			};

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>;
 			};
 		};

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;
 			};

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;
 			};

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;
 			};

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 {

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 */
 			};
 

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>;
 			};
 

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;
 			};
 

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 {

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 {

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)

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)

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