diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-09-17 17:12:45 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-09-17 17:12:45 +0200 |
| commit | f930922f061ea7bf585296859d1c14194c24b840 (patch) | |
| tree | c46b9f120f7c55f5baf8b6ac3048ba759e10a512 /lib_ppc | |
| parent | 97213f32416ead885deafea86774e912ffd60ad0 (diff) | |
| parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
| download | u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.zip u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.gz u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'lib_ppc')
| -rw-r--r-- | lib_ppc/board.c | 17 | ||||
| -rw-r--r-- | lib_ppc/extable.c | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 325f5c2..9aa67f9 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -209,9 +209,12 @@ static int init_baudrate (void) /***********************************************************************/ -#ifdef CONFIG_ADD_RAM_INFO -void board_add_ram_info(int); -#endif +void __board_add_ram_info(int use_default) +{ + /* please define platform specific board_add_ram_info() */ +} +void board_add_ram_info(int) __attribute__((weak, alias("__board_add_ram_info"))); + static int init_func_ram (void) { @@ -224,9 +227,7 @@ static int init_func_ram (void) if ((gd->ram_size = initdram (board_type)) > 0) { print_size (gd->ram_size, ""); -#ifdef CONFIG_ADD_RAM_INFO board_add_ram_info(0); -#endif putc('\n'); return (0); } @@ -309,7 +310,9 @@ init_fnc_t *init_sequence[] = { prt_8260_rsr, prt_8260_clks, #endif /* CONFIG_8260 */ - +#if defined(CONFIG_MPC83XX) + prt_83xx_rsr, +#endif checkcpu, #if defined(CONFIG_MPC5xxx) prt_mpc5xxx_clks, @@ -376,7 +379,7 @@ void board_init_f (ulong bootflag) /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("": : :"memory"); -#if !defined(CONFIG_CPM2) +#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83XX) /* Clear initial global data */ memset ((void *) gd, 0, sizeof (gd_t)); #endif diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c index 8354411..2d995fa 100644 --- a/lib_ppc/extable.c +++ b/lib_ppc/extable.c @@ -89,7 +89,7 @@ search_exception_table(unsigned long addr) /* if the serial port does not hang in exception, printf can be used */ #if !defined(CFG_SERIAL_HANG_IN_EXCEPTION) if (ex_tab_message) - printf("Bus Fault @ 0x%08lx, fixup 0x%08lx\n", addr, ret); + debug("Bus Fault @ 0x%08lx, fixup 0x%08lx\n", addr, ret); #endif if (ret) return ret; |