diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2017-01-25 15:21:08 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-01-27 02:09:38 +0100 |
| commit | 7218a1e754d84f84fd13bd5a66b38c6f0eb6f884 (patch) | |
| tree | ab824e589aafd031f03751d0b831c4c1192cad21 | |
| parent | 0e7a93fa65fcc7949c02ee9ac9a19af7351ee3f0 (diff) | |
| download | coreboot-7218a1e754d84f84fd13bd5a66b38c6f0eb6f884.tar.xz | |
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.
Change-Id: Icafba8d3e279a2e70e607abba81e3dbebfb55e4b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/18231
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc b/Makefile.inc index 9aec8a7a7e..d609ac4e03 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" |