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 79cb45c2c970ced5859e6965036aa1a79ca1f7e6..b4ed77595f0f59b4749df30850a90453a08d6629 100644 (file)
--- 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