diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2023-04-20 11:31:49 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2023-04-20 11:40:24 +0100 |
| commit | 42eeb22450f2c3225fa79a75c0ba881ac6809a77 (patch) | |
| tree | 20f204dc26c371e25a2f921582eb78a518bc75b5 /package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch | |
| parent | 9f2ede5551cfc41b21ab447aa5938ec161ae6481 (diff) | |
| download | upstream-42eeb22450f2c3225fa79a75c0ba881ac6809a77.tar.gz upstream-42eeb22450f2c3225fa79a75c0ba881ac6809a77.tar.bz2 upstream-42eeb22450f2c3225fa79a75c0ba881ac6809a77.zip | |
uboot-mediatek: fix factory/reset button
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>
Diffstat (limited to 'package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch')
| -rw-r--r-- | package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch index e144f42c47..928dfe8428 100644 --- a/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch +++ b/package/boot/uboot-mediatek/patches/302-mt7623-generic-reset-button-ignore-env.patch @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -@@ -41,3 +50,22 @@ int mmc_get_env_dev(void) +@@ -41,3 +50,25 @@ int mmc_get_env_dev(void) return mmc_get_boot_dev(); } #endif @@ -30,7 +30,10 @@ + 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); ++ 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"); |