From: Simon Glass <sjg@chromium.org>
Date: Sat, 15 Nov 2014 03:56:35 +0000 (-0700)
Subject: x86: Allow an option ROM to be built into U-Boot
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d040ac0a89a6ffdcd27bfba24984a339e8a4addc;p=u-boot.git

x86: Allow an option ROM to be built into U-Boot

Some x86 machines require a binary blob containing 16-bit initialisation
code for their video hardware. Allow this to be built into the x86 ROM so
that it is accessible during boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/Makefile b/Makefile
index 79cb45c2c9..b4ed77595f 100644
--- a/Makefile
+++ b/Makefile
@@ -980,6 +980,9 @@ u-boot.rom: u-boot-x86-16bit.bin u-boot-dtb.bin \
 	$(objtree)/tools/ifdtool -w \
 		$(CONFIG_SYS_X86_START16):$(objtree)/u-boot-x86-16bit.bin \
 		u-boot.tmp
+	$(objtree)/tools/ifdtool -w \
+		$(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILENAME) \
+		u-boot.tmp
 	mv u-boot.tmp $@
 
 OBJCOPYFLAGS_u-boot-x86-16bit.bin := -O binary -j .start16 -j .resetvec