diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-15 05:48:25 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-30 22:10:15 +0200 |
| commit | d13ff2358ff8c384f52eaf46f5d60258acf96ea6 (patch) | |
| tree | 75ce9bf31c1da0abf61fa0bf305cc94a8425c674 /lib_arm | |
| parent | 8fd4166c467a46773f80208bda1ec3b4757747bc (diff) | |
| download | blackbird-obmc-uboot-d13ff2358ff8c384f52eaf46f5d60258acf96ea6.tar.gz blackbird-obmc-uboot-d13ff2358ff8c384f52eaf46f5d60258acf96ea6.zip | |
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 f96b44cef897bd372beb86dde1b33637c119d84d.
in order to do it for all arm board
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/board.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 5ade882a97..47e834c9d0 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -220,18 +220,6 @@ static int init_func_i2c (void) } #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... * @@ -261,11 +249,6 @@ int print_cpuinfo (void); /* test-only */ init_fnc_t *init_sequence[] = { 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 */ interrupt_init, /* set up exceptions */ env_init, /* initialize environment */ |
