X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=payloads%2Fexternal%2FSeaBIOS%2FMakefile.inc;h=99d402c4e060e30165d8514a7195f803a4aca80e;hb=af2c538ee5b3adae6a51bd0e5c725a6a18688554;hp=0ffdb638e1b4aac1de68129ac1726cb97bc0a250;hpb=e3509fdb681a65fb945dca28b5193733a1b84b22;p=coreboot.git

diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 0ffdb638e..99d402c4e 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -1,31 +1,45 @@
 
 
 TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
-TAG-$(CONFIG_SEABIOS_STABLE)=rel-0.6.1.3
+TAG-$(CONFIG_SEABIOS_STABLE)=e66fb31eac3e6be6aaab548c229af9bb1ba55c33
 
-all: seabios
+unexport KCONFIG_AUTOCONFIG
 
-seabios: patch
-	cd seabios; $(MAKE)
+all: build
 
-patch: checkout
-	test -r seabios/.patched || \
-	perl -pi -e "s,#define CONFIG_COREBOOT 0,#define CONFIG_COREBOOT 1,;" \
-		 -e "s,#define CONFIG_DEBUG_SERIAL 0,#define CONFIG_DEBUG_SERIAL 1,;" \
-		 -e "s,#define CONFIG_VGAHOOKS 0,#define CONFIG_VGAHOOKS 1,;" \
-		 seabios/src/config.h
-	touch seabios/.patched
+seabios:
+	echo "    Cloning SeaBIOS from Git"
+	git clone git://git.seabios.org/seabios.git
 
-checkout:
-	echo "Checking out SeaBIOS $(TAG-y)"
-	test -d seabios && ( cd seabios; git fetch ) || \
-	git clone git://git.linuxtogo.org/home/kevin/seabios.git seabios
-	cd seabios; git checkout -m $(TAG-y)
+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 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
+	# This shows how to force a previously set .config option *off*
+	#echo "# CONFIG_SMBIOS is not set" >> seabios/.config
+
+build: config
+	echo "    MAKE       SeaBIOS $(TAG-y)"
+	$(MAKE) -C seabios
 
 clean:
-	test -d seabios && (cd seabios; $(MAKE) clean) || exit 0
+	test -d seabios && $(MAKE) -C seabios clean || exit 0
 
 distclean:
 	rm -rf seabios
 
-.PHONY: seabios
+.PHONY: checkout config build clean distclean clone fetch