diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-31 18:46:35 +0200 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-09-01 14:21:35 +0200 |
commit | 25e6854d42c11046a468576179b5494f850311b2 (patch) | |
tree | 8d082bde626cae091c6d3f8b0b18d7f3d32ed08b /lib_avr32/board.c | |
parent | 36d375faf5cff98e8dca32aabbbb1ec6036437dd (diff) | |
download | u-boot-imx-25e6854d42c11046a468576179b5494f850311b2.zip u-boot-imx-25e6854d42c11046a468576179b5494f850311b2.tar.gz u-boot-imx-25e6854d42c11046a468576179b5494f850311b2.tar.bz2 |
avr32: use board_early_init_r instead of board_init_info
Replace the avr32-specific board_init_info hook by the standard
board_early_init_r hook and make it optional.
board_early_init_r() runs somewhat earlier than board_init_info used to
do, but this isn't a problem for any of the in-tree boards.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'lib_avr32/board.c')
-rw-r--r-- | lib_avr32/board.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib_avr32/board.c b/lib_avr32/board.c index 19d76d2..4ed6c96 100644 --- a/lib_avr32/board.c +++ b/lib_avr32/board.c @@ -53,6 +53,7 @@ static int __do_nothing(void) return 0; } int board_postclk_init(void) __attribute__((weak, alias("__do_nothing"))); +int board_early_init_r(void) __attribute__((weak, alias("__do_nothing"))); /* The malloc area is right below the monitor image in RAM */ static void mem_malloc_init(void) @@ -282,6 +283,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) gd->flags |= GD_FLG_RELOC; gd->reloc_off = dest_addr - CFG_MONITOR_BASE; + board_early_init_r(); + monitor_flash_len = _edata - _text; /* @@ -318,7 +321,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) mem_malloc_init(); malloc_bin_reloc(); dma_alloc_init(); - board_init_info(); enable_interrupts(); |