diff options
| author | Tom Rini <trini@ti.com> | 2013-01-09 08:13:22 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-09 08:13:22 -0700 |
| commit | 642ef40bdc95bef829ae3aadc217f829c4c298c4 (patch) | |
| tree | 57d6d5170b904176a2a7018e08a615b8725c8874 /arch/arm/lib/board.c | |
| parent | 449485948e6de1869ec39c1559b7b78d85690ea7 (diff) | |
| parent | 61bdb9133593f0f881a57232039296f64bd662ed (diff) | |
| download | u-boot-imx-642ef40bdc95bef829ae3aadc217f829c4c298c4.zip u-boot-imx-642ef40bdc95bef829ae3aadc217f829c4c298c4.tar.gz u-boot-imx-642ef40bdc95bef829ae3aadc217f829c4c298c4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/lib/board.c')
| -rw-r--r-- | arch/arm/lib/board.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index e0cb635..0459d0c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -279,11 +279,6 @@ void board_init_f(ulong bootflag) bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_F, "board_init_f"); - /* Pointer is writable since we allocated a register for it */ - gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR) & ~0x07); - /* compiler optimization barrier needed for GCC >= 3.4 */ - __asm__ __volatile__("": : :"memory"); - memset((void *)gd, 0, sizeof(gd_t)); gd->mon_len = _bss_end_ofs; @@ -465,10 +460,6 @@ void board_init_f(ulong bootflag) gd->fdt_blob = new_fdt; } memcpy(id, (void *)gd, sizeof(gd_t)); - - relocate_code(addr_sp, id, addr); - - /* NOTREACHED - relocate_code() does not return */ } #if !defined(CONFIG_SYS_NO_FLASH) @@ -493,8 +484,6 @@ void board_init_r(gd_t *id, ulong dest_addr) ulong flash_size; #endif - gd = id; - gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r"); |