[coreboot-gerrit] Patch set updated for coreboot: d6ffa96 payloads/external/SeaBIOS: retain the built binary
Idwer Vollering (vidwer@gmail.com)
gerrit at coreboot.org
Sat Aug 2 00:43:59 CEST 2014
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 d6ffa962da0dfa6aaef106c3a0fc591d489b7f4c
Author: Idwer Vollering <vidwer at gmail.com>
Date: Sat Aug 2 00:03:20 2014 +0200
payloads/external/SeaBIOS: retain the built binary
build/ is wiped during 'make clean':
move SeaBIOS' build directory out of build/
Change-Id: I561b209798396d995984c244890e54f31671b5b1
Signed-off-by: Idwer Vollering <vidwer at gmail.com>
---
payloads/external/SeaBIOS/Makefile.inc | 33 +++++++++++++++++----------------
src/Kconfig | 2 +-
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 21f933a..8f4be2b 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -1,3 +1,4 @@
+
TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
TAG-$(CONFIG_SEABIOS_STABLE)=96917a8ed761f017fc8c72ba3b9181fbac03ac59
@@ -10,42 +11,42 @@ unexport KCONFIG_NEGATIVES
all: build
-$(OUT)/seabios:
+clone:
echo " Cloning SeaBIOS from Git"
- git clone http://review.coreboot.org/p/seabios.git $(OUT)/seabios
+ git clone http://review.coreboot.org/p/seabios.git seabios
-fetch: $(OUT)/seabios
- cd $(OUT)/seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \
+fetch: clone
+ 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)"
- echo "CONFIG_COREBOOT=y" > $(OUT)/seabios/.config
+ echo "CONFIG_COREBOOT=y" > seabios/.config
ifeq ($(CONFIG_CONSOLE_SERIAL),y)
- echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config
- echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> $(OUT)/seabios/.config
+ echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config
+ echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> seabios/.config
else
- echo "# CONFIG_DEBUG_SERIAL is not set" >> $(OUT)/seabios/.config
+ echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config
endif
ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
- echo "# CONFIG_THREAD_OPTIONROMS is not set" >> $(OUT)/seabios/.config
+ echo "# CONFIG_THREAD_OPTIONROMS is not set" >> 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/
+ #echo "# CONFIG_SMBIOS is not set" >> seabios/.config
+ $(MAKE) -C seabios olddefconfig OUT=out/
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 OUT=out/ || exit 0
distclean:
- rm -rf $(OUT)/seabios
+ rm -rf seabios
-.PHONY: checkout config build clean distclean clone fetch
+.PHONY: checkout config build clean distclean 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
More information about the coreboot-gerrit
mailing list