summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2014-12-17 15:50:43 +0800
committerSimon Glass <sjg@chromium.org>2014-12-18 17:26:07 -0700
commit63faf2507d263bbd6285b3fe637fd80df05a58a0 (patch)
treee9de4e0a73442d32ca6e725afeb909405349d3e2
parent8c5224c9f5c8a24ff5153f018e10a3ac4da5783a (diff)
downloadu-boot-imx-63faf2507d263bbd6285b3fe637fd80df05a58a0.zip
u-boot-imx-63faf2507d263bbd6285b3fe637fd80df05a58a0.tar.gz
u-boot-imx-63faf2507d263bbd6285b3fe637fd80df05a58a0.tar.bz2
x86: Include FSP and CMC binary in the u-boot.rom build rules
Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile10
-rw-r--r--include/configs/chromebook_link.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d962576..397edc1 100644
--- a/Makefile
+++ b/Makefile
@@ -961,8 +961,16 @@ ifneq ($(CONFIG_HAVE_MRC),)
IFDTOOL_FLAGS += -w $(CONFIG_X86_MRC_ADDR):$(srctree)/board/$(BOARDDIR)/mrc.bin
endif
+ifneq ($(CONFIG_HAVE_FSP),)
+IFDTOOL_FLAGS += -w $(CONFIG_FSP_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_FSP_FILE)
+endif
+
+ifneq ($(CONFIG_HAVE_CMC),)
+IFDTOOL_FLAGS += -w $(CONFIG_CMC_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_CMC_FILE)
+endif
+
ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)
-IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILENAME)
+IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILE)
endif
quiet_cmd_ifdtool = IFDTOOL $@
diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index c9d84e4..b311f4c 100644
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -39,7 +39,7 @@
{PCI_VENDOR_ID_INTEL, \
PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
-#define CONFIG_X86_OPTION_ROM_FILENAME pci8086,0166.bin
+#define CONFIG_X86_OPTION_ROM_FILE pci8086,0166.bin
#define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000
#define CONFIG_VIDEO_X86