diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2010-09-14 19:13:51 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-12 23:00:30 +0200 |
| commit | a1c4864ab0e1b98d82afa2438e54dc61ccad78cf (patch) | |
| tree | d71dd4822dd2960533ede728509a50dc4ac5b43d /arch/powerpc/lib/board.c | |
| parent | eaadb44edf6799099ee73d423bbfd5e33b8ee9ff (diff) | |
powerpc: Zero out board info struct on bootup
This puts the board info struct in a known state and allows the removal
of other code which initialized board info fields to 0.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'arch/powerpc/lib/board.c')
| -rw-r--r-- | arch/powerpc/lib/board.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index bfdfa8624..529f71960 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -480,6 +480,7 @@ void board_init_f (ulong bootflag) */ addr_sp -= sizeof (bd_t); bd = (bd_t *) addr_sp; + memset(bd, 0, sizeof(bd_t)); gd->bd = bd; debug ("Reserving %zu Bytes for Board Info at: %08lx\n", sizeof (bd_t), addr_sp); @@ -512,9 +513,6 @@ void board_init_f (ulong bootflag) #ifdef CONFIG_SYS_SRAM_BASE bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM memory */ bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM memory */ -#else - bd->bi_sramstart = 0; - bd->bi_sramsize = 0; #endif #if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \ @@ -739,14 +737,7 @@ void board_init_r (gd_t *id, ulong dest_addr) bd->bi_flashoffset = TEXT_BASE + flash_size; # elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for startup monitor */ -# else - bd->bi_flashoffset = 0; # endif -#else /* CONFIG_SYS_NO_FLASH */ - - bd->bi_flashsize = 0; - bd->bi_flashstart = 0; - bd->bi_flashoffset = 0; #endif /* !CONFIG_SYS_NO_FLASH */ WATCHDOG_RESET (); @@ -803,14 +794,8 @@ void board_init_r (gd_t *id, ulong dest_addr) if (s && ((*s == 'y') || (*s == 'Y'))) { bd->bi_iic_fast[0] = 1; bd->bi_iic_fast[1] = 1; - } else { - bd->bi_iic_fast[0] = 0; - bd->bi_iic_fast[1] = 0; } } -#else - bd->bi_iic_fast[0] = 0; - bd->bi_iic_fast[1] = 0; #endif /* CONFIG_I2CFAST */ #endif /* CONFIG_405GP, CONFIG_405EP */ #endif /* CONFIG_SYS_EXTBDINFO */ |