openwrt/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
Daniel Golle 9dfc2b3ca4
uboot-mediatek: update to 2021.04-rc3 with MediaTek's patches
MediaTek published their current U-Boot patchset on github:
https://github.com/mtk-openwrt/u-boot/commits/mtksoc

Import the platform patches from there (`00-mtk-*.patch`), arrange,
them nicely, drop no longer needed local patches and rebase on top of
U-Boot 2021.04-rc3.

Tested and works well on Linksys E8450 (snand-1ddr) as well as
Bananapi BPi-R64 (sdmmc-2ddr, emmc-2ddr).

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-11 16:24:53 +00:00

38 lines
795 B
Diff

--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -6,10 +6,17 @@
#include <common.h>
#include <config.h>
+#include <dm.h>
+#include <button.h>
+
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
+#ifndef CONFIG_RESET_BUTTON_LABEL
+#define CONFIG_RESET_BUTTON_LABEL "reset"
+#endif
+
DECLARE_GLOBAL_DATA_PTR;
int board_init(void)
@@ -20,7 +27,15 @@ int board_init(void)
int board_late_init(void)
{
- gd->env_valid = 1; //to load environment variable from persistent store
+ struct udevice *dev;
+ int ret;
+
+ ret = !!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev);
+
+ if (!ret)
+ ret = !button_get_state(dev);
+
+ gd->env_valid = ret; //to load environment variable from persistent store
env_relocate();
return 0;
}