[coreboot-gerrit] New patch to review for coreboot: Only add etc/ps2-keyboard-spinup when not updating an image

[Arthur Heymans (arthur@aheymans.xyz)]

Arthur Heymans (arthur at aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18231

-gerrit

commit c525de58753760e4c17dd87d2250993a5fbb6324
Author: Arthur Heymans <arthur at aheymans.xyz>
Date:   Wed Jan 25 15:21:08 2017 +0100

    Only add etc/ps2-keyboard-spinup when not updating an image
    
    Without this motherboards that requires a non zero timeout for ps2
    keyboards on SeaBIOS don't build when CONFIG_UPDATE_IMAGE is set.
    
    This is a workaround, since the proper way to do this would be not to
    call cbfstool in the Makefile, but to create the raw int file
    containing the timeout and have this file included in cbfs.
    This however requires to convert decimal to a little endian
    representation, for which there exist no simple solution in Makefile.
    
    Change-Id: Icafba8d3e279a2e70e607abba81e3dbebfb55e4b
    Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
 Makefile.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.inc b/Makefile.inc
index 0c6b351..ee3449c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -886,10 +886,12 @@ $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(
 	dd if=$(obj)/coreboot.pre of=$@.tmp bs=8192 conv=notrunc 2> /dev/null
 ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),)
 ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
+ifneq ($(CONFIG_UPDATE_IMAGE),y)
 	@printf "    SeaBIOS    Wait up to $(CONFIG_SEABIOS_PS2_TIMEOUT) ms for PS/2 keyboard controller initialization\n"
 	$(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup
 endif
 endif
+endif
 ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
 ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y)
 	@printf "    UPDATE-FIT\n"