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>
This commit is contained in:
Martin Schiller 2020-09-15 08:24:22 +02:00 committed by Adrian Schmutzler
parent 9f0d882680
commit a594a5a330
81 changed files with 85 additions and 85 deletions

View File

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

View File

@ -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

View File

@ -96,7 +96,7 @@
};
partition@3ff200 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x3ff200 0xc00>;
read-only;
};

View File

@ -148,7 +148,7 @@
read-only;
};
partition@64000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x64000 0x004000>;
};
ath9k_cal: partition@68000 {

View File

@ -162,7 +162,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -158,7 +158,7 @@
partition@10000 {
reg = <0x10000 0x10000>;
label = "uboot-env";
label = "u-boot-env";
read-only;
};

View File

@ -148,7 +148,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x10000>;
read-only;
};

View File

@ -144,7 +144,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -178,7 +178,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -145,7 +145,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>; /* 64 KB */
read-only;
};

View File

@ -155,7 +155,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -167,7 +167,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x10000>;
read-only;
};

View File

@ -116,7 +116,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -185,7 +185,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -123,7 +123,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x10000>;
read-only;
};

View File

@ -140,7 +140,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -172,7 +172,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -167,7 +167,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
};

View File

@ -109,7 +109,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -179,7 +179,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -192,7 +192,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};

View File

@ -62,7 +62,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x20000>;
};

View File

@ -154,7 +154,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x10000>; /* 64KB */
};

View File

@ -49,7 +49,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>; /* 64 KB */
};

View File

@ -77,7 +77,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
};

View File

@ -27,7 +27,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x40000>;
};

View File

@ -28,7 +28,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x40000>;
};

View File

@ -24,7 +24,7 @@
partition@40000 {
reg = <0x40000 0x80000>;
label = "uboot_env";
label = "u-boot-env";
};
partition@c0000 {

View File

@ -136,7 +136,7 @@
};
partition@30000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
};

View File

@ -203,7 +203,7 @@
};
partition@60000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x60000 0x20000>;
read-only;
};

View File

@ -136,7 +136,7 @@
};
partition@7f0000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x7f0000 0x10000>;
};
};

View File

@ -17,7 +17,7 @@
};
partition@60000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x60000 0x20000>; /* 128 KiB */
read-only;
};

View File

@ -16,7 +16,7 @@
read-only;
};
partition@60000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x60000 0x10000>;
read-only;
};

View File

@ -242,7 +242,7 @@
read-only;
};
partition@a0000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0xa0000 0x20000>;
read-only;
};

View File

@ -281,7 +281,7 @@
partition@ff0000 {
reg = <0xff0000 0x2000>;
label = "ubootconfig";
label = "u-boot-env";
};
partition@ff3000 {

View File

@ -33,7 +33,7 @@
};
partition@100000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x100000 0x40000>; /* 256 KB */
};

View File

@ -24,7 +24,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -160,7 +160,7 @@
partition@7f0000 {
reg = <0x7f0000 0x2000>;
label = "ubootconfig";
label = "u-boot-env";
read-only;
};

View File

@ -43,7 +43,7 @@
reg = <0x00000 0x40000>;
};
partition@40000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
};
partition@60000 {

View File

@ -35,7 +35,7 @@
read-only;
};
partition@50000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x50000 0x10000>;
};
partition@60000 {

View File

@ -96,7 +96,7 @@
};
partition@3ff200 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x3ff200 0xc00>;
read-only;
};

View File

@ -148,7 +148,7 @@
read-only;
};
partition@64000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x64000 0x004000>;
};
ath9k_cal: partition@68000 {

View File

@ -162,7 +162,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -158,7 +158,7 @@
partition@10000 {
reg = <0x10000 0x10000>;
label = "uboot-env";
label = "u-boot-env";
read-only;
};

View File

@ -148,7 +148,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x10000>;
read-only;
};

View File

@ -144,7 +144,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -178,7 +178,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -145,7 +145,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>; /* 64 KB */
read-only;
};

View File

@ -155,7 +155,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -167,7 +167,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x10000>;
read-only;
};

View File

@ -116,7 +116,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -185,7 +185,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -123,7 +123,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x10000>;
read-only;
};

View File

@ -140,7 +140,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
read-only;
};

View File

@ -172,7 +172,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -167,7 +167,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
};

View File

@ -109,7 +109,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -179,7 +179,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
read-only;
};

View File

@ -192,7 +192,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};

View File

@ -62,7 +62,7 @@
};
partition@20000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x20000 0x20000>;
};

View File

@ -154,7 +154,7 @@
};
partition@40000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x10000>; /* 64KB */
};

View File

@ -49,7 +49,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>; /* 64 KB */
};

View File

@ -77,7 +77,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
};

View File

@ -26,7 +26,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x40000>;
};

View File

@ -28,7 +28,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x40000 0x40000>;
};

View File

@ -23,7 +23,7 @@
partition@40000 {
reg = <0x40000 0x80000>;
label = "uboot_env";
label = "u-boot-env";
};
partition@c0000 {

View File

@ -136,7 +136,7 @@
};
partition@30000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x30000 0x10000>;
};

View File

@ -203,7 +203,7 @@
};
partition@60000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x60000 0x20000>;
read-only;
};

View File

@ -136,7 +136,7 @@
};
partition@7f0000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x7f0000 0x10000>;
};
};

View File

@ -17,7 +17,7 @@
};
partition@60000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x60000 0x20000>; /* 128 KiB */
read-only;
};

View File

@ -16,7 +16,7 @@
read-only;
};
partition@60000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x60000 0x10000>;
read-only;
};

View File

@ -242,7 +242,7 @@
read-only;
};
partition@a0000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0xa0000 0x20000>;
read-only;
};

View File

@ -281,7 +281,7 @@
partition@ff0000 {
reg = <0xff0000 0x2000>;
label = "ubootconfig";
label = "u-boot-env";
};
partition@ff3000 {

View File

@ -33,7 +33,7 @@
};
partition@100000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x100000 0x40000>; /* 256 KB */
};

View File

@ -24,7 +24,7 @@
};
partition@10000 {
label = "uboot_env";
label = "u-boot-env";
reg = <0x10000 0x10000>;
};

View File

@ -160,7 +160,7 @@
partition@7f0000 {
reg = <0x7f0000 0x2000>;
label = "ubootconfig";
label = "u-boot-env";
read-only;
};

View File

@ -43,7 +43,7 @@
reg = <0x00000 0x40000>;
};
partition@40000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x40000 0x20000>;
};
partition@60000 {

View File

@ -35,7 +35,7 @@
read-only;
};
partition@50000 {
label = "uboot-env";
label = "u-boot-env";
reg = <0x50000 0x10000>;
};
partition@60000 {

View File

@ -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)

View File

@ -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)

View File

@ -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