diff mbox

[U-Boot,09/19] x86: Allow an option ROM to be built into U-Boot

Message ID 1416023805-9297-10-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Nov. 15, 2014, 3:56 a.m. UTC
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>
---

 Makefile | 3 +++
 1 file changed, 3 insertions(+)

Comments

Simon Glass Nov. 25, 2014, 9:49 p.m. UTC | #1
On 14 November 2014 at 20:56, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
>  Makefile | 3 +++
>  1 file changed, 3 insertions(+)

Applied to u-boot-x86.
diff mbox

Patch

diff --git a/Makefile b/Makefile
index feb1b4c..04053c9 100644
--- a/Makefile
+++ b/Makefile
@@ -983,6 +983,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