Revert "ARM: set GD_FLG_RELOC for boards skipping relocation to RAM"
we need this due to the arm implementation which supposed that U-Boot
is in RAM when we jump to start_armboot
This reverts commit f96b44cef8
.
in order to do it for all arm board
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
8fd4166c46
commit
d13ff2358f
@ -220,18 +220,6 @@ static int init_func_i2c (void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SKIP_RELOCATE_UBOOT
|
|
||||||
/*
|
|
||||||
* This routine sets the relocation done flag, because even if
|
|
||||||
* relocation is skipped, the flag is used by other generic code.
|
|
||||||
*/
|
|
||||||
static int reloc_init(void)
|
|
||||||
{
|
|
||||||
gd->flags |= GD_FLG_RELOC;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Breathe some life into the board...
|
* Breathe some life into the board...
|
||||||
*
|
*
|
||||||
@ -261,11 +249,6 @@ int print_cpuinfo (void); /* test-only */
|
|||||||
|
|
||||||
init_fnc_t *init_sequence[] = {
|
init_fnc_t *init_sequence[] = {
|
||||||
cpu_init, /* basic cpu dependent setup */
|
cpu_init, /* basic cpu dependent setup */
|
||||||
#if defined(CONFIG_SKIP_RELOCATE_UBOOT)
|
|
||||||
reloc_init, /* Set the relocation done flag, must
|
|
||||||
do this AFTER cpu_init(), but as soon
|
|
||||||
as possible */
|
|
||||||
#endif
|
|
||||||
board_init, /* basic board dependent setup */
|
board_init, /* basic board dependent setup */
|
||||||
interrupt_init, /* set up exceptions */
|
interrupt_init, /* set up exceptions */
|
||||||
env_init, /* initialize environment */
|
env_init, /* initialize environment */
|
||||||
|
Loading…
Reference in New Issue
Block a user