[openwrt/openwrt] uboot-mediatek: unifi-6-lr: fix erase of production parition

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/af3a1adee063fa31cc05649f718f6ef2488a5232

commit af3a1adee063fa31cc05649f718f6ef2488a5232
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Apr 29 02:06:09 2021 +0100

    uboot-mediatek: unifi-6-lr: fix erase of production parition
    
    mtd erase needs to be aligned with erase blocks. Use padded image size
    for erasing the production volume.
    As the environment grew above the current size of 0x1000 bytes by
    introducing the new padding function, increase the env size to 0x4000.
    While at it, clean up reset button function to work to more reliable on
    that board.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../300-mt7622-generic-reset-button-ignore-env.patch      | 15 ++++++++-------
 .../uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch  | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
index 8b38248757..e794e0a0db 100644
--- a/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
+++ b/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
@@ -17,7 +17,7 @@
  
  DECLARE_GLOBAL_DATA_PTR;
  
-@@ -20,7 +27,19 @@ int board_init(void)
+@@ -20,7 +27,20 @@ int board_init(void)
  
  int board_late_init(void)
  {
@@ -25,16 +25,17 @@
 +	struct udevice *dev;
 +	int ret;
 +
-+	ret = !!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev);
-+
-+	if (!ret) {
++	if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
++		puts("reset button found\n");
 +#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
-+		udelay(1000 * CONFIG_RESET_BUTTON_SETTLE_DELAY);
++		mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
 +#endif
-+		ret = !button_get_state(dev);
++		if (button_get_state(dev) == BUTTON_ON) {
++			puts("button pushed, resetting environment\n");
++			gd->env_valid = ENV_INVALID;
++		}
 +	}
 +
-+	gd->env_valid = ret; //to load environment variable from persistent store
  	env_relocate();
  	return 0;
  }
diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
index 1af0da13c5..8e8fe04a07 100644
--- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
+++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
@@ -10,12 +10,12 @@
 +CONFIG_USE_DEFAULT_ENV_FILE=y
 +CONFIG_ENV_IS_IN_MTD=y
 +CONFIG_ENV_MTD_NAME="nor0"
-+CONFIG_ENV_SIZE_REDUND=0x0
-+CONFIG_ENV_SIZE=0x1000
++CONFIG_ENV_SIZE_REDUND=0x4000
++CONFIG_ENV_SIZE=0x4000
 +CONFIG_ENV_OFFSET=0xc0000
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_BOARD_LATE_INIT=y
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=200
++CONFIG_RESET_BUTTON_SETTLE_DELAY=400
 +CONFIG_BOOTP_SEND_HOSTNAME=y
 +CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr_env"
 +CONFIG_DEBUG_UART_BASE=0x11002000
@@ -356,7 +356,7 @@
  	mt8512-bm1-emmc.dtb \
 --- /dev/null
 +++ b/ubnt_unifi-6-lr_env
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,52 @@
 +mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)
 +ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory
 +ipaddr=192.168.1.1
@@ -402,8 +402,9 @@
 +reset_factory=mtd erase nor0 0xc0000 0x10000 && reset
 +nor_read_production=mtd read nor0 $loadaddr 0x1000000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x1000000 $image_size
 +nor_read_recovery=mtd read nor0 $loadaddr 0x120000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x120000 $image_size
-+nor_write_production=mtd erase nor0 0x1000000 $filesize && mtd write nor0 $loadaddr 0x1000000 $filesize
-+nor_write_recovery=mtd erase nor0 0x120000 0xee0000 && mtd write nor0 $loadaddr 0x120000 $filesize
++nor_pad_size=imsz $loadaddr image_size ; setexpr image_eb $image_size / 0x1000 ; setexpr tmp1 image_size % 0x1000 ; test 0x$tmp1 -gt 0 && setexpr image_eb $image_eb + 1 ; setexpr image_eb $image_eb * 0x1000
++nor_write_production=run nor_pad_size ; test 0x$image_eb -le 0x3000000 && mtd erase nor0 0x1000000 0x$image_eb && mtd write nor0 $loadaddr 0x1000000 $filesize
++nor_write_recovery=run nor_pad_size ; test 0x$image_eb -le 0xee0000 && mtd erase nor0 0x120000 0x$image_eb && mtd write nor0 $loadaddr 0x120000 $filesize
 +_init_env=setenv _init_env ; saveenv
 +_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
 +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title