aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch
diff options
context:
space:
mode:
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.patch17
1 files changed, 10 insertions, 7 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 aeb4c49b9e..8b38248757 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
@@ -1,24 +1,23 @@
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
-@@ -6,10 +6,17 @@
+@@ -6,9 +6,16 @@
#include <common.h>
#include <config.h>
+#include <dm.h>
+#include <button.h>
-+
#include <env.h>
#include <init.h>
#include <asm/global_data.h>
-
++#include <linux/delay.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)
+@@ -20,7 +27,19 @@ int board_init(void)
int board_late_init(void)
{
@@ -28,8 +27,12 @@
+
+ ret = !!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev);
+
-+ if (!ret)
++ if (!ret) {
++#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
++ udelay(1000 * CONFIG_RESET_BUTTON_SETTLE_DELAY);
++#endif
+ ret = !button_get_state(dev);
++ }
+
+ gd->env_valid = ret; //to load environment variable from persistent store
env_relocate();