[U-Boot] [PATCH 3/3] x86: Fix board init breakage

[Simon Glass]

Hi Tom,

On 15 January 2016 at 05:23, Simon Glass <sjg at chromium.org> wrote:
> 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 at chromium.org>
> ---
>
>  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 d98648e..d17bb29 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.6.0.rc2.230.g3dd15c0
>

This is a bug fix to fix x86 booting so can you please take this directly?

Regards,
Simon