Merge branch 'fixes' of git://git.denx.de/u-boot-mips

This commit is contained in:
Tom Rini 2013-02-15 12:23:42 -05:00
commit 9f024f62e4

View file

@ -249,9 +249,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
{
#ifndef CONFIG_SYS_NO_FLASH
ulong size;
#endif
#ifndef CONFIG_ENV_IS_NOWHERE
extern char *env_name_spec;
#endif
bd_t *bd;
@ -266,11 +263,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
serial_initialize();
/* there are some other pointer constants we must deal with */
#ifndef CONFIG_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off;
#endif
bd = gd->bd;
/* The Malloc area is immediately below the monitor copy in DRAM */