[coreboot-gerrit] New patch to review for coreboot: 03a90a9 Makefile.inc: Only include SeaBIOS config files when SeaBIOS payload is selected

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5958

-gerrit

commit 03a90a932883e0db6e581d70b60b08119098d985
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sat Jun 7 22:35:18 2014 +0200

    Makefile.inc: Only include SeaBIOS config files when SeaBIOS payload is selected
    
    Currently, building a board selecting `SEABIOS_PS2_TIMEOUT` in its
    Kconfig file, the SeaBIOS config file `etc/ps2-keyboard-spinup` is
    included in CBFS even if no payload or another payload than SeaBIOS
    is chosen.
    
        […]
            PAYLOAD    none (as specified by user)
            SeaBIOS    Wait up to 3000 ms for PS/2 keyboard controller initialization
            CONFIG     .config
            CBFSPRINT  coreboot.rom
    
        coreboot.rom: 2048 kB, bootblocksize 1424, romsize 2097152, offset 0x0
        alignment: 64 bytes
    
        Name                           Offset     Type         Size
        cmos_layout.bin                0x0        cmos_layout  1828
        cmos.default                   0x780      cmos_default 256
        cpu_microcode_blob.bin         0x8c0      microcode    94208
        etc/ps2-keyboard-spinup        0x17900    raw          8
        […]
    
    So add guards to only add the SeaBIOS config file, when SeaBIOS is
    selected as the payload during build.
    
    Change-Id: Ib770c9148285963db8056c1cc9fd7435630f2782
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 Makefile.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.inc b/Makefile.inc
index b9a3fe9..ed18e29 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -509,12 +509,14 @@ ifneq ($(CONFIG_PAYLOAD_FILE),)
 	@printf "    PAYLOAD    $(CONFIG_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"
 	$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) $(ADDITIONAL_PAYLOAD_CONFIG)
 endif
+ifeq ($(CONFIG_PAYLOAD_SEABIOS),y)
 ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),)
 ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
 	@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_INCLUDE_CONFIG_FILE),y)
 	@printf "    CONFIG     $(DOTCONFIG)\n"
 	if [ -f $(DOTCONFIG) ]; then \