It's not clear how we would handle graphics init in 64-bit mode. Probably we would need to change back to 32-bit or 16-bit to run the graphics ROM. For now, disable it in 64-bit mode.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/cpu/ivybridge/Makefile | 2 +- arch/x86/cpu/ivybridge/bd82x6x.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile index a853e45..96185d2 100644 --- a/arch/x86/cpu/ivybridge/Makefile +++ b/arch/x86/cpu/ivybridge/Makefile @@ -9,7 +9,7 @@ obj-y += fsp_configs.o ivybridge.o else obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += cpu.o obj-y += early_me.o -obj-y += gma.o +obj-$(CONFIG_X86_32BIT_INIT) += gma.o obj-y += lpc.o obj-y += model_206ax.o obj-y += northbridge.o diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index 3c5e159..cdab365 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -169,9 +169,13 @@ static int bd82x6x_probe(struct udevice *dev) ret = syscon_get_by_driver_data(X86_SYSCON_GMA, &gma_dev); if (ret) return ret; + + /* TODO(sjg@chromium.org): Handle graphics init in SPL or 64-bit mode */ +#ifndef CONFIG_X86_64 ret = gma_func0_init(gma_dev); if (ret) return ret; +#endif
return 0; }