[openwrt/openwrt] uboot-mediatek: bpi-r64: no longer force recovery on first-boot

[LEDE Commits]

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

commit 1db4681617b9aef724c9ccf15e62ba2a91d52564
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Apr 2 15:45:02 2021 +0100

    uboot-mediatek: bpi-r64: no longer force recovery on first-boot
    
    Now that sdcard.gz image contains everything needed to boot straight
    into production image, no longer force booting into recovery image on
    first boot by removing the logic which implemented that.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../patches/403-add-bananapi_bpi-r64_defconfigs.patch             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
index a030b4ce3f..b550ae4156 100644
--- a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
+++ b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
@@ -175,8 +175,8 @@
 +bootmenu_6=Install bootloader and recovery to eMMC.=run emmc_init ; run bootmenu_confirm_return
 +bootmenu_7=Reboot.=reset
 +bootmenu_8=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; run boot_tftp_forever
-+boot_first=if button reset ; then run boot_tftp_forever ; fi ; setenv flag_recover 1 ; bootmenu
++boot_default=run bootcmd ; run boot_recovery ; run boot_tftp_forever
++boot_first=if button reset ; then run boot_tftp_forever ; fi ; bootmenu
 +boot_production=led bpi-r64:pio:green on ; run sdmmc_read_production && bootm $loadaddr#$bootconf
 +boot_recovery=led bpi-r64:pio:green off ; run sdmmc_read_recovery && bootm $loadaddr#$bootconf
 +boot_sdmmc=run boot_production ; run boot_recovery
@@ -382,8 +382,8 @@
 +bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; run boot_tftp_recovery ; setenv noboot ; run bootmenu_confirm_return
 +bootmenu_6=Reboot.=reset
 +bootmenu_7=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; run boot_tftp_forever
-+boot_first=if button reset ; then run boot_tftp_forever ; fi ; setenv flag_recover 1 ; bootmenu
++boot_default=run bootcmd ; run boot_recovery ; run boot_tftp_forever
++boot_first=if button reset ; then run boot_tftp_forever ; fi ; bootmenu
 +boot_production=led bpi-r64:pio:green on ; run emmc_read_production && bootm $loadaddr#$bootconf
 +boot_recovery=led bpi-r64:pio:green off ; run emmc_read_recovery && bootm $loadaddr#$bootconf
 +boot_emmc=run boot_production ; run boot_recovery