diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-15 05:23:23 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-15 08:09:46 -0500 |
| commit | af7a55514a03788c23fd2ea5c9364195f58dc38e (patch) | |
| tree | f76e791540dae5ed3e049e58789ab0bb43986b97 /common/init/board_init.c | |
| parent | d830b1520a720a19e4bbaa3d928e85115429c132 (diff) | |
| download | blackbird-obmc-uboot-af7a55514a03788c23fd2ea5c9364195f58dc38e.tar.gz blackbird-obmc-uboot-af7a55514a03788c23fd2ea5c9364195f58dc38e.zip | |
x86: Fix board init breakage
Commit ecc30663 ("Fix board init code to respect the C runtime environment")
breaks x86. This was mentioned on https://patchwork.ozlabs.org/patch/548644
but not addressed. Correct it so that x86 boards boot again.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/init/board_init.c')
| -rw-r--r-- | common/init/board_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index d98648eaa6..d17bb298d7 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -128,7 +128,7 @@ void board_init_f_init_reserve(ulong base) *ptr++ = 0; #endif /* set GD unless architecture did it already */ -#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) +#if !defined(CONFIG_ARM) arch_setup_gd(gd_ptr); #endif /* next alloc will be higher by one GD plus 16-byte alignment */ |
