diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
commit | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (patch) | |
tree | 8f1a0f42ce7d9c66d0ff2ecf93c9b069cbc68cc0 /lib_ppc/board.c | |
parent | 870cbeaa45ccdbd6566882741da9f82433bd4a86 (diff) | |
parent | 6587f7e1e98bfcb7910a47bae2eb51e9a5fbd4da (diff) | |
download | bootable_bootloader_goldelico_gta04-281f69ede28cd3d8be5d62a96b5a0b73e6065858.zip bootable_bootloader_goldelico_gta04-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.gz bootable_bootloader_goldelico_gta04-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.bz2 |
Merge branch 'wd'
Diffstat (limited to 'lib_ppc/board.c')
-rw-r--r-- | lib_ppc/board.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 2c29f46..039053a 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -270,7 +270,8 @@ init_fnc_t *init_sequence[] = { #if !defined(CONFIG_8xx_CPUCLK_DEFAULT) get_clocks, /* get CPU and bus clocks (etc.) */ -#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) +#if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \ + && !defined(CONFIG_TQM885D) adjust_sdram_tbs_8xx, #endif init_timebase, @@ -610,6 +611,11 @@ void board_init_r (gd_t *id, ulong dest_addr) bd = gd->bd; gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ + gd->reloc_off = dest_addr - CFG_MONITOR_BASE; + +#ifdef CONFIG_SERIAL_MULTI + serial_initialize(); +#endif debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); @@ -619,14 +625,8 @@ void board_init_r (gd_t *id, ulong dest_addr) board_early_init_r (); #endif - gd->reloc_off = dest_addr - CFG_MONITOR_BASE; - monitor_flash_len = (ulong)&__init_end - dest_addr; -#ifdef CONFIG_SERIAL_MULTI - serial_initialize(); -#endif - /* * We have to relocate the command table manually */ |