sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move SeaBIOS output out of coreboot source tree

Browse Source 
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>
This commit is contained in:
Stefan Reinauer
2012-01-21 10:34:22 -08:00
committed by Marc Jones
parent 3e0bd19026
commit aff6dc2149
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 fetch: $(OUT)/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 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 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 config: checkout
echo " CONFIG SeaBIOS $(TAG-y)" echo " CONFIG SeaBIOS $(TAG-y)"
$(MAKE) -C seabios defconfig $(MAKE) -C $(OUT)/seabios defconfig OUT=$(OUT)/seabios/out/
echo "CONFIG_COREBOOT=y" >> seabios/.config echo "CONFIG_COREBOOT=y" >> $(OUT)/seabios/.config
echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config
echo "CONFIG_DEBUG_SERIAL_PORT=0x3f8" >> seabios/.config echo "CONFIG_DEBUG_SERIAL_PORT=0x3f8" >> $(OUT)/seabios/.config
echo "CONFIG_COREBOOT_FLASH=y" >> seabios/.config echo "CONFIG_COREBOOT_FLASH=y" >> $(OUT)/seabios/.config
echo "CONFIG_LZMA=y" >> seabios/.config echo "CONFIG_LZMA=y" >> $(OUT)/seabios/.config
echo "CONFIG_FLASH_FLOPPY=y" >> seabios/.config echo "CONFIG_FLASH_FLOPPY=y" >> $(OUT)/seabios/.config
echo "CONFIG_VGAHOOKS=y" >> 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 build: config
echo " MAKE SeaBIOS $(TAG-y)" 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

2
src/Kconfig
View File

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

4
src/arch/x86/Makefile.inc
View File

@@ -380,7 +380,9 @@ seabios:
CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \ CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \ OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \ CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
OUT=$(abspath $(obj))
filo: filo:
$(MAKE) -C payloads/external/FILO -f Makefile.inc \ $(MAKE) -C payloads/external/FILO -f Makefile.inc \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \