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>

diff --git a/common/init/board_init.c b/common/init/board_init.c
index d98648eaa6fc26fbb9836622fbfee2552534d826..d17bb298d72edc13cec4fd40083fd66f89fe943a 100644 (file)
--- 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 */