diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-02-11 12:55:32 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-02-11 12:55:32 +0100 |
| commit | 17998eff9021b7b579c0387e934d8c52603fe247 (patch) | |
| tree | edc3ef069db4cdaf9c718ae60e095caf42cd1d0d /common/board_r.c | |
| parent | 6ba45cc0f8b46533965219cfd90864a60ec1009b (diff) | |
| parent | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (diff) | |
| download | u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.zip u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.gz u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index 86ca1cb..c2d0763 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -903,9 +903,19 @@ init_fnc_t init_sequence_r[] = { void board_init_r(gd_t *new_gd, ulong dest_addr) { +#ifdef CONFIG_NEEDS_MANUAL_RELOC + int i; +#endif + #ifndef CONFIG_X86 gd = new_gd; #endif + +#ifdef CONFIG_NEEDS_MANUAL_RELOC + for (i = 0; i < ARRAY_SIZE(init_sequence_r); i++) + init_sequence_r[i] += gd->reloc_off; +#endif + if (initcall_run_list(init_sequence_r)) hang(); |