From: Simon Glass <sjg@chromium.org>
Date: Mon, 16 Jan 2017 14:03:47 +0000 (-0700)
Subject: x86: ivybridge: Allow 32-bit init to move to SPL
X-Git-Tag: v2017.03-rc2~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=987116f7f6432f07bcfbbaf5cff6c62503edad1e;p=oweals%2Fu-boot.git

x86: ivybridge: Allow 32-bit init to move to SPL

Update the Makefile so that some 32-bit init can be built into SPL rather
than U-Boot proper.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile
index 498e71a1b9..d13d0d3f69 100644
--- a/arch/x86/cpu/ivybridge/Makefile
+++ b/arch/x86/cpu/ivybridge/Makefile
@@ -7,12 +7,12 @@
 ifdef CONFIG_HAVE_FSP
 obj-y += fsp_configs.o ivybridge.o
 else
-obj-y += cpu.o
+obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += cpu.o
 obj-y += early_me.o
 obj-y += lpc.o
 obj-y += model_206ax.o
 obj-y += northbridge.o
 obj-y += sata.o
-obj-y += sdram.o
+obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += sdram.o
 endif
 obj-y += bd82x6x.o