mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-12 13:35:21 -04:00
Merge branch 'fixes' of git://git.denx.de/u-boot-mips
This commit is contained in:
commit
9f024f62e4
@ -249,9 +249,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
|
|||||||
{
|
{
|
||||||
#ifndef CONFIG_SYS_NO_FLASH
|
#ifndef CONFIG_SYS_NO_FLASH
|
||||||
ulong size;
|
ulong size;
|
||||||
#endif
|
|
||||||
#ifndef CONFIG_ENV_IS_NOWHERE
|
|
||||||
extern char *env_name_spec;
|
|
||||||
#endif
|
#endif
|
||||||
bd_t *bd;
|
bd_t *bd;
|
||||||
|
|
||||||
@ -266,11 +263,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
|
|||||||
|
|
||||||
serial_initialize();
|
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;
|
bd = gd->bd;
|
||||||
|
|
||||||
/* The Malloc area is immediately below the monitor copy in DRAM */
|
/* The Malloc area is immediately below the monitor copy in DRAM */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user