From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 14 Jun 2015 14:53:15 +0000 (+0200)
Subject: sun6i: cpu_reset: Do not return from cpu_reset()
X-Git-Tag: v2015.07-rc3~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc175434f97d5db518fb6e9a9bfec85e6c166603;p=oweals%2Fu-boot.git

sun6i: cpu_reset: Do not return from cpu_reset()

Currently on sun6i after a "reset" the prompt returns and the user can
even type stuff until the watchdog triggers and does the actual reset.

This is somewhat unexpected behavior for the "reset" command, this
commit adds an endless loop to wait for the watchdog to trigger so that
we do not return to the prompt.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
---

diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index 4b2494ea37..8a4770b438 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -202,6 +202,7 @@ void reset_cpu(ulong addr)
 	writel(WDT_CFG_RESET, &wdog->cfg);
 	writel(WDT_MODE_EN, &wdog->mode);
 	writel(WDT_CTRL_KEY | WDT_CTRL_RESTART, &wdog->ctl);
+	while (1) { }
 #endif
 }