From: Michal Simek Date: Fri, 2 Nov 2012 08:33:05 +0000 (+0100) Subject: microblaze: Fix reset function X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce07ca1391825ec03bbcc0880043f236654297bf;p=thirdparty%2Fu-boot.git microblaze: Fix reset function Remove CONFIG_SYS_RESET_ADDRESS macro. It was there from historical point of view when soft reset was just jump to u-boot text start (not used right now). Signed-off-by: Michal Simek --- diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 91b50cd2ec2..bb844f8d240 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -38,11 +38,11 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *((u32 volatile *)(CONFIG_SYS_GPIO_0_ADDR)) = ++(*((u32 volatile *)(CONFIG_SYS_GPIO_0_ADDR))); #endif -#ifdef CONFIG_SYS_RESET_ADDRESS + puts ("Reseting board\n"); disable_interrupts(); asm ("bra r0"); -#endif + return 0; }