diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-08-04 19:18:14 +0200 |
| commit | 0f2b5d8ec0969a5b0992f5031bf3c61117a41d59 (patch) | |
| tree | fc05bf5db93e5a9c1712d24a5efdff94685063c2 /lib_arm | |
| parent | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (diff) | |
| parent | 81091f58f0c58ecd26c5b05de2ae20ca6cdb521c (diff) | |
| download | u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.zip u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.gz u-boot-imx-0f2b5d8ec0969a5b0992f5031bf3c61117a41d59.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/board.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 80b149b..a093860 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -233,6 +233,18 @@ 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... * @@ -262,6 +274,11 @@ 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 */ |