diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-13 11:17:31 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-13 11:17:31 +0200 |
| commit | 1f6aa622e365fef9d87de84753eb08347e310a2a (patch) | |
| tree | 232149e6d93c9387b03628c5d3283cecf7719476 /lib_arm/board.c | |
| parent | 542b385a620a1783454a00424930e51895f45073 (diff) | |
| parent | df4a0796e86662536df2387ddcf969c2a704bcc2 (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 5ade882a97e..f02fdc87cac 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 */ @@ -307,6 +290,8 @@ void start_armboot (void) gd->bd = (bd_t*)((char*)gd - sizeof(bd_t)); memset (gd->bd, 0, sizeof (bd_t)); + gd->flags |= GD_FLG_RELOC; + monitor_flash_len = _bss_start - _armboot_start; for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { |