blob: c54b73475841aaa2011de5d096ab39c9cd612b55 [file] [log] [blame]
Andrew Jeffery2b552542018-04-20 13:52:04 +09301From 345b1ade63576f5a8a1c3a4a1b75aab41d84b714 Mon Sep 17 00:00:00 2001
2From: Andrew Jeffery <andrew@aj.id.au>
3Date: Fri, 20 Apr 2018 13:29:58 +0930
4Subject: [PATCH] config/ast-common: Fall-back to secondary flash on failed
5 bootm
6
7Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
8---
9 include/configs/ast-common.h | 4 +++-
10 1 file changed, 3 insertions(+), 1 deletion(-)
11
12diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
13index ad08016ec110..10ef6a1955b7 100644
14--- a/include/configs/ast-common.h
15+++ b/include/configs/ast-common.h
16@@ -127,12 +127,14 @@
17 #define CONFIG_ENV_OVERWRITE
18
19 #define ASPEED_ENV_SETTINGS \
20+ "wdt2bite=mw.l 0x1e785024 0xa 1; mw.b 0x1e78502c 0xb3 1 \0" \
21+ "bootalt=run wdt2bite \0" \
22 "ubiblock=0,1 \0" \
23 "root=/dev/ubiblock0_1 \0" \
24 "kernelname=kernel-0 \0" \
25 "loadaddr=" __stringify(CONFIG_LOADADDR) "\0" \
26 "set_bootargs=setenv bootargs " CONFIG_BOOTARGS " ubi.block=\${ubiblock} root=\${root} \0" \
27- "obmc_bootcmd=ubi part obmc-ubi; run do_rwreset; ubi read ${loadaddr} ${kernelname}; bootm ${loadaddr} \0" \
28+ "obmc_bootcmd=ubi part obmc-ubi; run do_rwreset; ubi read ${loadaddr} ${kernelname}; bootm ${loadaddr} || run bootalt \0" \
29 "verify=yes\0" \
30 "spi_dma=yes\0" \
31 "mtdids=" MTDIDS_DEFAULT "\0" \
32--
332.14.1
34