diff options
| author | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
| commit | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (patch) | |
| tree | e3ca947656fea69adb810bab0ee5a32c0d413919 /common | |
| parent | b7a809957bcd72c2efa49ce733774b1e28878585 (diff) | |
| parent | a7f99bf139b3aaa0d5494693fd0395084355e41a (diff) | |
| download | u-boot-imx-114cc4290b2f24bb314edf2edd5d8738a0778c4b.zip u-boot-imx-114cc4290b2f24bb314edf2edd5d8738a0778c4b.tar.gz u-boot-imx-114cc4290b2f24bb314edf2edd5d8738a0778c4b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index f9647e1..551429c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -912,7 +912,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) int i; #endif -#ifndef CONFIG_X86 +#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) gd = new_gd; #endif |