Move SeaBIOS output out of coreboot source tree

Make sure SeaBIOS build files live under $(OUT) instead of
in the source tree.

Change-Id: I7d357773e32bc25ba7e7eae3fb6ddc31feb413ec
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/552
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Marc Jones <marcj303@gmail.com>

diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 99d402c4e060e30165d8514a7195f803a4aca80e..7d0d6fc1600b0afd9577806c845395fff64ee16e 100644 (file)
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -7,39 +7,39 @@ unexport KCONFIG_AUTOCONFIG
 
 all: build
 
 
 all: build
 

-seabios:
+$(OUT)/seabios:

        echo "    Cloning SeaBIOS from Git"
        echo "    Cloning SeaBIOS from Git"

-       git clone git://git.seabios.org/seabios.git
+       git clone git://git.seabios.org/seabios.git $(OUT)/seabios

 
 

-fetch: seabios
-       cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \
+fetch: $(OUT)/seabios
+       cd $(OUT)/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)"
        then echo "    Fetching new commits from the SeaBIOS git repo"; git fetch; fi
 
 checkout: fetch
        echo "    Checking out SeaBIOS revision $(TAG-y)"

-       cd seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
+       cd $(OUT)/seabios; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)

 
 config: checkout
        echo "    CONFIG     SeaBIOS $(TAG-y)"
 
 config: checkout
        echo "    CONFIG     SeaBIOS $(TAG-y)"

-       $(MAKE) -C seabios defconfig
-       echo "CONFIG_COREBOOT=y" >> 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
+       $(MAKE) -C $(OUT)/seabios defconfig OUT=$(OUT)/seabios/out/
+       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

        # This shows how to force a previously set .config option *off*
        # This shows how to force a previously set .config option *off*

-       #echo "# CONFIG_SMBIOS is not set" >> seabios/.config
+       #echo "# CONFIG_SMBIOS is not set" >> $(OUT)/seabios/.config

 
 build: config
        echo "    MAKE       SeaBIOS $(TAG-y)"
 
 build: config
        echo "    MAKE       SeaBIOS $(TAG-y)"

-       $(MAKE) -C seabios
+       $(MAKE) -C $(OUT)/seabios OUT=$(OUT)/seabios/out/

 
 clean:
 
 clean:

-       test -d seabios && $(MAKE) -C seabios clean || exit 0
+       test -d $(OUT)/seabios && $(MAKE) -C $(OUT)/seabios clean OUT=$(OUT)/seabios/out/ || exit 0

 
 distclean:
 
 distclean:

-       rm -rf seabios
+       rm -rf $(OUT)/seabios

 
 .PHONY: checkout config build clean distclean clone fetch
 
 .PHONY: checkout config build clean distclean clone fetch

diff --git a/src/Kconfig b/src/Kconfig
index 64c359e8d05bd5c15fd6215d26ea83b053d6129c..c165d932a7ee444fe3347567f5dc58e7533ad7d2 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -444,7 +444,7 @@ config PAYLOAD_FILE
 
 config PAYLOAD_FILE
        depends on PAYLOAD_SEABIOS
 
 config PAYLOAD_FILE
        depends on PAYLOAD_SEABIOS

-       default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
+       default "$(obj)/seabios/out/bios.bin.elf"

 
 config PAYLOAD_FILE
        depends on PAYLOAD_FILO
 
 config PAYLOAD_FILE
        depends on PAYLOAD_FILO

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index cbe38dd56df342876231f059fb96cd906a7b76d9..c9cbb01b4a77ea9fdd9ebf2df88f3b65d872cfef 100755 (executable)
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -380,7 +380,9 @@ seabios:
                        CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
                        OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
                        CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
                        CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
                        OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
                        CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \

-                       CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE)
+                       CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
+                       OUT=$(abspath $(obj))
+

 filo:
        $(MAKE) -C payloads/external/FILO -f Makefile.inc \
                        HOSTCC="$(HOSTCC)" \
 filo:
        $(MAKE) -C payloads/external/FILO -f Makefile.inc \
                        HOSTCC="$(HOSTCC)" \