diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2018-06-28 10:30:05 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-07-19 10:49:54 +0200 |
| commit | d6c856c008a3f24a4606e14bbf3039a7355ec42a (patch) | |
| tree | 9108e950c6c4006b15299194c72808cc405d7fe0 | |
| parent | 4ab11ecaaa5f24ffef32b7606c5452b1f83e75af (diff) | |
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>
| -rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |