projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of ../master
[oweals/u-boot.git]
/
lib_nios2
/
board.c
diff --git
a/lib_nios2/board.c
b/lib_nios2/board.c
index 70fad1b87029f2c54c05f248b9b2b48bf3003746..0677e999952ac82994c91215e8e4a7099cd6dc55 100644
(file)
--- a/
lib_nios2/board.c
+++ b/
lib_nios2/board.c
@@
-148,12
+148,14
@@
void board_init (void)
}
}
+ WATCHDOG_RESET ();
+ mem_malloc_init();
+ malloc_bin_reloc();
+
WATCHDOG_RESET ();
bd->bi_flashsize = flash_init();
WATCHDOG_RESET ();
- mem_malloc_init();
- malloc_bin_reloc();
env_relocate();
bd->bi_ip_addr = getenv_IPaddr ("ipaddr");