Idwer Vollering (vidwer@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6460
-gerrit
commit 2110e74e2a47610528baad134b381464ece56101 Author: Idwer Vollering vidwer@gmail.com Date: Mon Aug 11 16:09:07 2014 +0200
payloads/external/SeaBIOS: move build directory
Move SeaBIOS' build directory out of build/ This allows the user to delete build/ in the top dir and keep the built binary in payloads/external/SeaBIOS/seabios/out/
Change-Id: Ia7d515cd7e349beebcd9b62c9d956137acb73c82 Signed-off-by: Idwer Vollering vidwer@gmail.com --- payloads/external/SeaBIOS/Makefile.inc | 30 +++++++++++++++--------------- src/Kconfig | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 21f933a..97f9d56 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -10,42 +10,42 @@ unexport KCONFIG_NEGATIVES
all: build
-$(OUT)/seabios: +seabios: 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: seabios + 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 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 693e0e7..70294e9 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -681,7 +681,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