From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 28 Jun 2018 08:30:05 +0000 (+0200)
Subject: microblaze: Guard do_reset by CONFIG_SYSRESET
X-Git-Tag: v2018.09-rc1~141^2~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d6c856c008a3f24a4606e14bbf3039a7355ec42a;p=oweals%2Fu-boot.git

microblaze: Guard do_reset by CONFIG_SYSRESET

sysreset uclass have own do_reset function which should be used instead
of board/platform specific.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 58ca1d715d..889695f80e 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -58,6 +58,7 @@ int dram_init(void)
 	return 0;
 };
 
+#if !defined(CONFIG_SYSRESET) || defined(CONFIG_SPL_BUILD)
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 #ifndef CONFIG_SPL_BUILD
@@ -76,6 +77,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	return 0;
 }
+#endif
 
 static int gpio_init(void)
 {