linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

sunxi: Correct boot command sequence when watchdog support is not enabled

Browse Source
This commit is contained in:
Henrik Nordstrom
2013-04-28 22:40:34 +02:00
parent 6b3a581e7f
commit 90c8c0c883
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/configs/sunxi-common.h
View File

@ -164,6 +164,12 @@
"fi;" \
"run setargs boot_mmc;" \
#ifdef CONFIG_CMD_WATCHDOG
#define RESET_WATCHDOG " watchdog 0 &&"
#else
#define RESET_WATCHDOG ""
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttyS0,115200\0" \
"root=/dev/mmcblk0p2 rootwait\0" \
@ -184,7 +190,8 @@
" ext2load mmc 0 $scriptaddr boot/${bootenv}\0" \
"boot_mmc=fatload mmc 0 0x43000000 script.bin &&" \
" fatload mmc 0 0x48000000 ${kernel} &&" \
" watchdog 0 && bootm 0x48000000\0"
RESET_WATCHDOG \
" && bootm 0x48000000\0"
#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_BOOT_GET_CMDLINE