From d6c856c008a3f24a4606e14bbf3039a7355ec42a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 28 Jun 2018 10:30:05 +0200 Subject: [PATCH] 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 --- 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 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) { -- 2.25.1