diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-02-20 13:04:38 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-03-11 16:24:53 +0000 |
| commit | 9dfc2b3ca4dff28259576e21bc3ade910ff52a05 (patch) | |
| tree | bc7a3bbea0fa638ece89027d3f04fcd0d09a9359 /package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch | |
| parent | e2cffbb80528b1c13bbaba6e53835de378ef3923 (diff) | |
| download | upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.tar.gz upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.tar.bz2 upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.zip | |
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>
Diffstat (limited to 'package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch')
| -rw-r--r-- | package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 0000000000..aeb4c49b9e --- /dev/null +++ b/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch @@ -0,0 +1,37 @@ +--- 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; + } |