[coreboot-gerrit] New patch to review for coreboot: 03e3945 payloads/external/SeaBIOS: retain the built binary

[Idwer Vollering (vidwer@gmail.com)]

Idwer Vollering (vidwer at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6387

-gerrit

commit 03e394534f294903a3ac58fabc9931b5bde41f65
Author: Idwer Vollering <vidwer at gmail.com>
Date:   Mon Jul 28 00:02:34 2014 +0200

    payloads/external/SeaBIOS: retain the built binary
    
    Move SeaBIOS' build directory out of build/
    
    Change-Id: I561b209798396d995984c244890e54f31671b5b1
    Signed-off-by: Idwer Vollering <vidwer at gmail.com>
---
 payloads/external/SeaBIOS/Makefile.inc | 39 ++++++++++++++++------------------
 src/Kconfig                            |  2 +-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 48ca582..8495689 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -10,43 +10,40 @@ unexport KCONFIG_NEGATIVES
 
 all: build
 
-$(OUT)/seabios:
-	echo "    Cloning SeaBIOS from Git"
-	git clone http://review.coreboot.org/p/seabios.git $(OUT)/seabios
-
-fetch: $(OUT)/seabios
-	cd $(OUT)/seabios; git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ]; \
+fetch:
+	if [ ! -d seabios ]; then git clone http://review.coreboot.org/p/seabios.git seabios; fi
+	cd seabios; git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ]; \
 	then echo "    Fetching new commits from the SeaBIOS git repo"; git fetch; fi
 
 checkout: fetch
 	echo "    Checking out SeaBIOS revision $(TAG-y)"
-	cd $(OUT)/seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
+	cd seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
 
 config: checkout
 	echo "    CONFIG     SeaBIOS $(TAG-y)"
-	$(MAKE) -C $(OUT)/seabios defconfig OUT=$(OUT)/seabios/out/
-	echo "CONFIG_COREBOOT=y" >> $(OUT)/seabios/.config
+	$(MAKE) -C seabios defconfig OUT=out/
+	echo "CONFIG_COREBOOT=y" >> seabios/.config
 ifeq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
-	echo "CONFIG_THREAD_OPTIONROMS=y" >> $(OUT)/seabios/.config
+	echo "CONFIG_THREAD_OPTIONROMS=y" >> seabios/.config
 endif
-	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
+	echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config
+	echo "CONFIG_DEBUG_SERIAL_PORT=0x3f8" >> seabios/.config
+	echo "CONFIG_COREBOOT_FLASH=y" >> seabios/.config
+	echo "CONFIG_LZMA=y" >> seabios/.config
+	echo "CONFIG_FLASH_FLOPPY=y" >> seabios/.config
+	echo "CONFIG_VGAHOOKS=y" >> seabios/.config
+	echo "CONFIG_DEBUG_COREBOOT=y" >> seabios/.config
 	# This shows how to force a previously set .config option *off*
-	#echo "# CONFIG_SMBIOS is not set" >> $(OUT)/seabios/.config
+	#echo "# CONFIG_SMBIOS is not set" >> seabios/.config
 
 build: config
 	echo "    MAKE       SeaBIOS $(TAG-y)"
-	$(MAKE) -C $(OUT)/seabios OUT=$(OUT)/seabios/out/
+	$(MAKE) -C seabios OUT=out/
 
 clean:
-	test -d $(OUT)/seabios && $(MAKE) -C $(OUT)/seabios clean OUT=$(OUT)/seabios/out/ || exit 0
+	test -d seabios && $(MAKE) -C seabios clean OUT=out/ || exit 0
 
 distclean:
-	rm -rf $(OUT)/seabios
+	rm -rf seabios
 
 .PHONY: checkout config build clean distclean clone fetch
diff --git a/src/Kconfig b/src/Kconfig
index af82353..8127315 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -671,7 +671,7 @@ config PAYLOAD_FILE
 
 config PAYLOAD_FILE
 	depends on PAYLOAD_SEABIOS
-	default "$(obj)/seabios/out/bios.bin.elf"
+	default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
 
 config PAYLOAD_FILE
 	depends on PAYLOAD_FILO