* use built-in default environment instead of file in bootfs * get rid of bootfs alltogether and use uImage.FIT * auto-detect boot device like original script did * add support for factory button Signed-off-by: Daniel Golle <daniel@makrotopia.org>
		
			
				
	
	
		
			53 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			53 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
 | 
						|
 
 | 
						|
 DECLARE_GLOBAL_DATA_PTR;
 | 
						|
 
 | 
						|
@@ -20,7 +27,20 @@ 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;
 | 
						|
+
 | 
						|
+	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/board/mediatek/mt7622/Kconfig
 | 
						|
+++ b/board/mediatek/mt7622/Kconfig
 | 
						|
@@ -14,4 +14,8 @@ config MTK_BROM_HEADER_INFO
 | 
						|
 	string
 | 
						|
 	default "media=nor"
 | 
						|
 
 | 
						|
+config RESET_BUTTON_LABEL
 | 
						|
+	string "Button to trigger factory reset"
 | 
						|
+	default "reset"
 | 
						|
+
 | 
						|
 endif
 |