package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch

   1 --- a/board/mediatek/mt7622/mt7622_rfb.c
   2 +++ b/board/mediatek/mt7622/mt7622_rfb.c
   3 @@ -6,9 +6,16 @@
   4
   5  #include <common.h>
   6  #include <config.h>
   7 +#include <dm.h>
   8 +#include <button.h>
   9  #include <env.h>
  10  #include <init.h>
  11  #include <asm/global_data.h>
  12 +#include <linux/delay.h>
  13 +
  14 +#ifndef CONFIG_RESET_BUTTON_LABEL
  15 +#define CONFIG_RESET_BUTTON_LABEL "reset"
  16 +#endif
  17
  18  #include <mtd.h>
  19  #include <linux/mtd/mtd.h>
  20 @@ -25,7 +32,22 @@ int board_init(void)
  21
  22  int board_late_init(void)
  23  {
  24 -       gd->env_valid = 1; //to load environment variable from persistent store
  25 +       struct udevice *dev;
  26 +
  27 +       if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
  28 +               puts("reset button found\n");
  29 +#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
  30 +               if (CONFIG_RESET_BUTTON_SETTLE_DELAY > 0) {
  31 +                       button_get_state(dev);
  32 +                       mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
  33 +               }
  34 +#endif
  35 +               if (button_get_state(dev) == BUTTON_ON) {
  36 +                       puts("button pushed, resetting environment\n");
  37 +                       gd->env_valid = ENV_INVALID;
  38 +               }
  39 +       }
  40 +
  41         env_relocate();
  42         return 0;
  43  }
  44 --- a/arch/arm/mach-mediatek/Kconfig
  45 +++ b/arch/arm/mach-mediatek/Kconfig
  46 @@ -140,4 +140,11 @@ config MTK_BROM_HEADER_INFO
  47
  48  source "board/mediatek/mt7629/Kconfig"
  49
  50 +config RESET_BUTTON_LABEL
  51 +       string "Button to trigger factory reset"
  52 +       default "reset"
  53 +
  54 +config RESET_BUTTON_SETTLE_DELAY
  55 +       int "Delay to wait for button to settle"
  56 +       default 0
  57  endif