mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
0ea329fec4
Weijie Gao has submitted an updated version of the patchset adding support for MT7986 and MT7981 to U-Boot. Use that v2 patchset. Changes of v2: - Add cpu driver for print_cpuinfo() - Fix NULL pointer dereference in mtk_image (was already fixed in OpenWrt) - Fix coding style - Minor changes https://patchwork.ozlabs.org/project/uboot/list/?series=316148 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
52 lines
1.2 KiB
Diff
52 lines
1.2 KiB
Diff
--- a/board/mediatek/mt7622/mt7622_rfb.c
|
|
+++ b/board/mediatek/mt7622/mt7622_rfb.c
|
|
@@ -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
|
|
|
|
#include <mtd.h>
|
|
#include <linux/mtd/mtd.h>
|
|
@@ -25,7 +32,19 @@ int board_init(void)
|
|
|
|
int board_late_init(void)
|
|
{
|
|
- gd->env_valid = 1; //to load environment variable from persistent store
|
|
+ struct udevice *dev;
|
|
+
|
|
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
|
|
+ puts("reset button found\n");
|
|
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
|
|
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
|
|
+#endif
|
|
+ if (button_get_state(dev) == BUTTON_ON) {
|
|
+ puts("button pushed, resetting environment\n");
|
|
+ gd->env_valid = ENV_INVALID;
|
|
+ }
|
|
+ }
|
|
+
|
|
env_relocate();
|
|
return 0;
|
|
}
|
|
--- a/arch/arm/mach-mediatek/Kconfig
|
|
+++ b/arch/arm/mach-mediatek/Kconfig
|
|
@@ -140,4 +140,8 @@ config MTK_BROM_HEADER_INFO
|
|
|
|
source "board/mediatek/mt7629/Kconfig"
|
|
|
|
+config RESET_BUTTON_LABEL
|
|
+ string "Button to trigger factory reset"
|
|
+ default "reset"
|
|
+
|
|
endif
|