summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2021-11-17 14:04:11 +0300
committerNeil Armstrong <narmstrong@baylibre.com>2021-11-19 20:15:26 +0300
commit28f70cfcfd82ac509c8da772b74e5dc2df795fd2 (patch)
treee8b1ce94f3df7851654e333c206ae54bafb9e483 /include
parentbdc68df4ddc1330b7d34a520e94d58608d057019 (diff)
downloadu-boot-28f70cfcfd82ac509c8da772b74e5dc2df795fd2.tar.xz
configs: meson64_android: add PANIC stage for SYSTEM fails
If bootloader was updated without running oem format, reboot will cause boot loop because the SYSTEM stage fails. Add a final PANIC stage running fastboot to permit recovery. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/meson64_android.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 93d8f8ec99..7cd1ab0341 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -233,16 +233,24 @@
"echo Running Android...;" \
BOOT_CMD \
"fi;" \
- "echo Failed to boot Android...;" \
- "reset\0"
+ "echo Failed to boot Android...;\0"
#define BOOTENV_DEV_NAME_SYSTEM(devtypeu, devtypel, instance) \
"system "
+#define BOOTENV_DEV_PANIC(devtypeu, devtypel, instance) \
+ "bootcmd_panic=" \
+ "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
+ "reset\0"
+
+#define BOOTENV_DEV_NAME_PANIC(devtypeu, devtypel, instance) \
+ "panic "
+
#define BOOT_TARGET_DEVICES(func) \
func(FASTBOOT, fastboot, na) \
func(RECOVERY, recovery, na) \
func(SYSTEM, system, na) \
+ func(PANIC, panic, na) \
#define PREBOOT_LOAD_LOGO \
"if test \"${boot_source}\" != \"usb\" && " \