mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
42eeb22450
U-Boot commit ea6fdc13595 ("dm: button: add support for linux_code in
button-gpio.c driver") makes it mandatory to specify linux,code for all
buttons. As that broke handling of the reset button in U-Boot with the
update to U-Boot 2023.04, add linux,code for all butons.
Reported-by: @DragonBluep
Fixes: 50f7c5af4a ("uboot-mediatek: update to v2023.04")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
47 lines
980 B
Diff
47 lines
980 B
Diff
--- a/board/mediatek/mt7623/mt7623_rfb.c
|
|
+++ b/board/mediatek/mt7623/mt7623_rfb.c
|
|
@@ -4,8 +4,17 @@
|
|
*/
|
|
|
|
#include <common.h>
|
|
+#include <dm.h>
|
|
+#include <button.h>
|
|
+#include <env.h>
|
|
+#include <init.h>
|
|
#include <mmc.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;
|
|
|
|
@@ -41,3 +50,25 @@ int mmc_get_env_dev(void)
|
|
return mmc_get_boot_dev();
|
|
}
|
|
#endif
|
|
+
|
|
+int board_late_init(void)
|
|
+{
|
|
+ struct udevice *dev;
|
|
+
|
|
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
|
|
+ puts("reset button found\n");
|
|
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
|
|
+ if (CONFIG_RESET_BUTTON_SETTLE_DELAY > 0) {
|
|
+ button_get_state(dev);
|
|
+ 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;
|
|
+}
|