From af7a55514a03788c23fd2ea5c9364195f58dc38e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 15 Jan 2016 05:23:23 -0700 Subject: [PATCH] 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 Reviewed-by: Tom Rini --- common/init/board_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ -- 2.39.5