summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-11-14 20:56:35 -0700
committerSimon Glass <sjg@chromium.org>2014-11-25 07:11:16 -0700
commitd040ac0a89a6ffdcd27bfba24984a339e8a4addc (patch)
treeb1b5696a52970d01ef64442b9e92839550ad53cb /Makefile
parent998110241bfc5c7101e20e38948e0a3b68c3ecc9 (diff)
downloadu-boot-d040ac0a89a6ffdcd27bfba24984a339e8a4addc.tar.gz
u-boot-d040ac0a89a6ffdcd27bfba24984a339e8a4addc.tar.xz
u-boot-d040ac0a89a6ffdcd27bfba24984a339e8a4addc.zip
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
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