[U-Boot] [PATCH 2/2] microblaze: Guard do_reset by CONFIG_SYSRESET

Michal Simek michal.simek at xilinx.com
Thu Jun 28 08:44:07 UTC 2018


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

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

 board/xilinx/microblaze-generic/microblaze-generic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 2cd945c177cd..c0ba0e0cb67f 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -68,6 +68,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
@@ -92,6 +93,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	return 0;
 }
+#endif
 
 static int gpio_init(void)
 {
-- 
1.9.1



More information about the U-Boot mailing list