[coreboot-gerrit] Patch set updated for coreboot: fe34abf payloads/external/SeaBIOS: Update makefile for olddefconfig

[Martin Roth (gaumless@gmail.com)]

Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6362

-gerrit

commit fe34abfa41a86d5224f3dd2d539428d4ced6ebff
Author: Martin Roth <martin.roth at se-eng.com>
Date:   Fri Jul 25 14:24:32 2014 -0600

    payloads/external/SeaBIOS: Update makefile for olddefconfig
    
    Instead of creating the SeaBIOS .config file for QEMU, then changing
    things to be coreboot specific, create a default config for coreboot,
    then run olddefconfig to use the SeaBIOS defaults as they're set for
    coreboot.  This leads to a cleaner config.
    
    Note that CONFIG_THREAD_OPTIONROMS defaults to enabled for SeaBIOS if
    we're building for coreboot, so I reversed the logic.
    
    I *ASSUMED* that leaving CONFIG_QEMU_HARDWARE=y and CONFIG_DEBUG_IO=y
    previously was an oversight.  If this is not correct, please let me
    know and I'll add them it back in.  SeaBIOS disables these by default
    if building for coreboot.
    
    Change-Id: I42c6a56205bb15c6693a5f3a716b7876a4d78abe
    Signed-off-by: Martin Roth <martin.roth at se-eng.com>
---
 payloads/external/SeaBIOS/Makefile.inc | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 48ca582..e981309 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -24,20 +24,14 @@ checkout: fetch
 
 config: checkout
 	echo "    CONFIG     SeaBIOS $(TAG-y)"
-	$(MAKE) -C $(OUT)/seabios defconfig OUT=$(OUT)/seabios/out/
-	echo "CONFIG_COREBOOT=y" >> $(OUT)/seabios/.config
-ifeq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
-	echo "CONFIG_THREAD_OPTIONROMS=y" >> $(OUT)/seabios/.config
-endif
+	echo "CONFIG_COREBOOT=y" > $(OUT)/seabios/.config
 	echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config
-	echo "CONFIG_DEBUG_SERIAL_PORT=0x3f8" >> $(OUT)/seabios/.config
-	echo "CONFIG_COREBOOT_FLASH=y" >> $(OUT)/seabios/.config
-	echo "CONFIG_LZMA=y" >> $(OUT)/seabios/.config
-	echo "CONFIG_FLASH_FLOPPY=y" >> $(OUT)/seabios/.config
-	echo "CONFIG_VGAHOOKS=y" >> $(OUT)/seabios/.config
-	echo "CONFIG_DEBUG_COREBOOT=y" >> $(OUT)/seabios/.config
+ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
+	echo "# CONFIG_THREAD_OPTIONROMS is not set" >> $(OUT)/seabios/.config
+endif
 	# This shows how to force a previously set .config option *off*
 	#echo "# CONFIG_SMBIOS is not set" >> $(OUT)/seabios/.config
+	$(MAKE) -C $(OUT)/seabios olddefconfig OUT=$(OUT)/seabios/out/
 
 build: config
 	echo "    MAKE       SeaBIOS $(TAG-y)"