commit 4de38860c2ecf5c8942e0176fc9131746a1133cf
author Bin Meng <bmeng.cn@gmail.com> Mon Jul 06 16:31:33 2015 +0800
committer Simon Glass <sjg@chromium.org> Tue Jul 14 18:03:18 2015 -0600
tree 9b4881656db5e70fbecc8712a8122165d2f06101
parent 933a29b1b5401eb106c7a9528abd12256aa4c64f

x86: Move VGA option rom macros to Kconfig

Move X86_OPTION_ROM_FILE & X86_OPTION_ROM_ADDR to arch/x86/Kconfig
and rename them to VGA_BIOS_FILE & VGA_BIOS_ADDR which depend on
HAVE_VGA_BIOS. The new names are consistent with other x86 binary
blob options like HAVE_FSP/FSP_FILE/FSP_ADDR.

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

Makefile

diff --git a/Makefile b/Makefile
index a7dce06..b6f83a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1035,8 +1035,8 @@
 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_FILE)
+ifneq ($(CONFIG_HAVE_VGA_BIOS),)
+IFDTOOL_FLAGS += -w $(CONFIG_VGA_BIOS_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_VGA_BIOS_FILE)
 endif
 
 quiet_cmd_ifdtool = IFDTOOL $@