From 90c8c0c88362d1e39bb1433f04b9a21bb1c74e45 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 28 Apr 2013 22:40:34 +0200
Subject: [PATCH] sunxi: Correct boot command sequence when watchdog support is
 not enabled

---
 include/configs/sunxi-common.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 3c5341b608..da9dd3737d 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -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