uboot-mediatek: replace patches with updated versions
[openwrt/staging/aparcar.git] / 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,19 @@ 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 + mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
31 +#endif
32 + if (button_get_state(dev) == BUTTON_ON) {
33 + puts("button pushed, resetting environment\n");
34 + gd->env_valid = ENV_INVALID;
35 + }
36 + }
37 +
38 env_relocate();
39 return 0;
40 }
41 --- a/arch/arm/mach-mediatek/Kconfig
42 +++ b/arch/arm/mach-mediatek/Kconfig
43 @@ -140,4 +140,8 @@ config MTK_BROM_HEADER_INFO
44
45 source "board/mediatek/mt7629/Kconfig"
46
47 +config RESET_BUTTON_LABEL
48 + string "Button to trigger factory reset"
49 + default "reset"
50 +
51 endif