[coreboot] New patch to review for coreboot: 7c77c17 Move SeaBIOS output out of coreboot source tree
Stefan Reinauer (stefan.reinauer@coreboot.org)
gerrit at coreboot.org
Wed Jan 18 23:26:42 CET 2012
Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/552
-gerrit
commit 7c77c17c2998ba7b9e3ad4ae926a8030f50180ee
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date: Wed Jan 18 23:25:16 2012 +0100
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 at google.com>
---
payloads/external/SeaBIOS/Makefile.inc | 30 +++++++++++++++---------------
src/arch/x86/Makefile.inc | 4 +++-
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 99d402c..5e34d6a 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -9,37 +9,37 @@ all: build
seabios:
echo " Cloning SeaBIOS from Git"
- git clone git://git.seabios.org/seabios.git
+ cd $(OUT) && git clone git://git.seabios.org/seabios.git
fetch: seabios
- cd seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \
+ 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)"
- 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)"
- $(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*
- #echo "# CONFIG_SMBIOS is not set" >> seabios/.config
+ #echo "# CONFIG_SMBIOS is not set" >> $(OUT)/seabios/.config
build: config
echo " MAKE SeaBIOS $(TAG-y)"
- $(MAKE) -C seabios
+ $(MAKE) -C $(OUT)/seabios OUT=$(OUT)/seabios/out
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:
- rm -rf seabios
+ rm -rf $(OUT)/seabios
.PHONY: checkout config build clean distclean clone fetch
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 54f0f82..3442b49 100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -387,7 +387,9 @@ seabios:
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)" \
More information about the coreboot
mailing list