From 76e5c519dae861f2bb5284a2262b43f3b09d710b Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 25 Jan 2017 15:21:08 +0100 Subject: [PATCH] UPSTREAM: 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. An alternative way to achieve this file would be to include a cbfsfile instead of calling cbfstool. That way the file gets updated/added both both image update and regular build. A difficulty of that approach is that it needs to convert a decimal to a binary in little endian representation, which is not a trivial thing to do in a Makefile. BUG=none BRANCH=none TEST=none Change-Id: I4814675b2f006656d1bd6f418e38afadee6aeb80 Signed-off-by: Patrick Georgi Original-Commit-Id: 7218a1e754d84f84fd13bd5a66b38c6f0eb6f884 Original-Change-Id: Icafba8d3e279a2e70e607abba81e3dbebfb55e4b Original-Signed-off-by: Arthur Heymans Original-Reviewed-on: https://review.coreboot.org/18231 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/433883 --- Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.inc b/Makefile.inc index dbd14c4d97..cbbab87607 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -890,10 +890,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"