GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Reviewed-on: http://review.coreboot.org/6460
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Idwer Vollering 2014-08-11 16:09:07 +02:00
parent df6d09d0fb
commit ab11a6a94c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
payloads/external/SeaBIOS/Makefile.inc vendored
View File

@ -10,42 +10,42 @@ unexport KCONFIG_NEGATIVES
all: build all: build
$(OUT)/seabios: seabios:
echo " Cloning SeaBIOS from Git" 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 fetch: seabios
cd $(OUT)/seabios; git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \ 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 then echo " Fetching new commits from the SeaBIOS git repo"; git fetch; fi
checkout: fetch checkout: fetch
echo " Checking out SeaBIOS revision $(TAG-y)" 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 config: checkout
echo " CONFIG SeaBIOS $(TAG-y)" echo " CONFIG SeaBIOS $(TAG-y)"
echo "CONFIG_COREBOOT=y" > $(OUT)/seabios/.config echo "CONFIG_COREBOOT=y" > seabios/.config
ifeq ($(CONFIG_CONSOLE_SERIAL),y) ifeq ($(CONFIG_CONSOLE_SERIAL),y)
echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config
echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> $(OUT)/seabios/.config echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> seabios/.config
else else
echo "# CONFIG_DEBUG_SERIAL is not set" >> $(OUT)/seabios/.config echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config
endif endif
ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) 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 endif
# 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" >> $(OUT)/seabios/.config #echo "# CONFIG_SMBIOS is not set" >> seabios/.config
$(MAKE) -C $(OUT)/seabios olddefconfig OUT=$(OUT)/seabios/out/ $(MAKE) -C seabios olddefconfig OUT=out/
build: config build: config
echo " MAKE SeaBIOS $(TAG-y)" echo " MAKE SeaBIOS $(TAG-y)"
$(MAKE) -C $(OUT)/seabios OUT=$(OUT)/seabios/out/ $(MAKE) -C seabios OUT=out/
clean: 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: distclean:
rm -rf $(OUT)/seabios rm -rf seabios
.PHONY: checkout config build clean distclean clone fetch .PHONY: checkout config build clean distclean clone fetch

2
src/Kconfig
View File

@ -681,7 +681,7 @@ config PAYLOAD_FILE
config PAYLOAD_FILE config PAYLOAD_FILE
depends on PAYLOAD_SEABIOS depends on PAYLOAD_SEABIOS
default "$(obj)/seabios/out/bios.bin.elf" default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
config PAYLOAD_FILE config PAYLOAD_FILE
depends on PAYLOAD_FILO depends on PAYLOAD_FILO