From c8ed34075b7785c91cfb1c8556357b2e70cf765d Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Wed, 16 Mar 2016 10:39:30 -0600
Subject: payloads/external: Rename Makefile.inc to Makefile

These makefiles are not included by anything, so they shouldn't be
named Makefile.inc.  Also, having them all be named 'Makefile' makes
some other consolidation work I'm doing much easier.

Change-Id: I1234539ba6a0a6f47d2eb0c21de3da3607c6b8de
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/14130
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 payloads/Makefile.inc                        | 16 +++---
 payloads/external/FILO/Makefile              | 49 +++++++++++++++++
 payloads/external/FILO/Makefile.inc          | 49 -----------------
 payloads/external/GRUB2/Makefile             | 53 ++++++++++++++++++
 payloads/external/GRUB2/Makefile.inc         | 53 ------------------
 payloads/external/Makefile.inc               | 12 ++--
 payloads/external/Memtest86Plus/Makefile     | 42 ++++++++++++++
 payloads/external/Memtest86Plus/Makefile.inc | 42 --------------
 payloads/external/SeaBIOS/Makefile           | 74 +++++++++++++++++++++++++
 payloads/external/SeaBIOS/Makefile.inc       | 74 -------------------------
 payloads/external/U-Boot/Makefile            | 82 ++++++++++++++++++++++++++++
 payloads/external/U-Boot/Makefile.inc        | 82 ----------------------------
 payloads/external/depthcharge/Makefile       | 71 ++++++++++++++++++++++++
 payloads/external/depthcharge/Makefile.inc   | 71 ------------------------
 14 files changed, 385 insertions(+), 385 deletions(-)
 create mode 100644 payloads/external/FILO/Makefile
 delete mode 100644 payloads/external/FILO/Makefile.inc
 create mode 100644 payloads/external/GRUB2/Makefile
 delete mode 100644 payloads/external/GRUB2/Makefile.inc
 create mode 100644 payloads/external/Memtest86Plus/Makefile
 delete mode 100644 payloads/external/Memtest86Plus/Makefile.inc
 create mode 100644 payloads/external/SeaBIOS/Makefile
 delete mode 100644 payloads/external/SeaBIOS/Makefile.inc
 create mode 100644 payloads/external/U-Boot/Makefile
 delete mode 100644 payloads/external/U-Boot/Makefile.inc
 create mode 100644 payloads/external/depthcharge/Makefile
 delete mode 100644 payloads/external/depthcharge/Makefile.inc

(limited to 'payloads')

diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index 792df606f9..ee3c41a133 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -23,18 +23,18 @@ payloads/coreinfo/build/coreinfo.elf coreinfo:
 clean-payloads:
 	$(MAKE) -C payloads/coreinfo clean
 	$(MAKE) -C payloads/libpayload clean
-	$(MAKE) -C payloads/external/depthcharge -f Makefile.inc clean
-	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean
-	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean
-	$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc clean
+	$(MAKE) -C payloads/external/depthcharge clean
+	$(MAKE) -C payloads/external/SeaBIOS clean
+	$(MAKE) -C payloads/external/U-Boot clean
+	$(MAKE) -C payloads/external/Memtest86Plus clean
 
 
 distclean-payloads:
 	$(MAKE) -C payloads/coreinfo distclean
 	$(MAKE) -C payloads/libpayload distclean
-	$(MAKE) -C payloads/external/depthcharge -f Makefile.inc distclean
-	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc distclean
-	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc distclean
-	$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc distclean
+	$(MAKE) -C payloads/external/depthcharge distclean
+	$(MAKE) -C payloads/external/SeaBIOS distclean
+	$(MAKE) -C payloads/external/U-Boot distclean
+	$(MAKE) -C payloads/external/Memtest86Plus distclean
 
 .phony: clean-payloads distclean-payloads
diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile
new file mode 100644
index 0000000000..6a96a22455
--- /dev/null
+++ b/payloads/external/FILO/Makefile
@@ -0,0 +1,49 @@
+TAG-$(CONFIG_FILO_MASTER)=origin/master
+NAME-$(CONFIG_FILO_MASTER)=MASTER
+TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646
+NAME-$(CONFIG_FILO_STABLE)=STABLE
+
+unexport KCONFIG_AUTOHEADER
+unexport KCONFIG_AUTOCONFIG
+unexport KCONFIG_DEPENDENCIES
+unexport KCONFIG_SPLITCONFIG
+unexport KCONFIG_TRISTATE
+unexport KCONFIG_NEGATIVES
+
+all: filo
+
+checkout:
+	echo "    GIT        FILO $(NAME-y)"
+	test -d filo || \
+		git clone http://review.coreboot.org/p/filo.git
+	cd filo && \
+		git checkout master && \
+		git remote update && \
+		test -n $(TAG-y) && \
+			git branch -f $(NAME-y) $(TAG-y) && \
+			git checkout $(NAME-y)
+
+config: libpayload
+	echo "    CONFIG     FILO $(NAME-y)"
+	$(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload
+	# This shows how to force a previously unset .config option *on*
+	#echo "CONFIG_VGAHOOKS=y" >> filo/.config
+	# This shows how to force a previously set .config option *off*
+	#echo "# CONFIG_SMBIOS is not set" >> filo/.config
+	$(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload
+
+filo: config
+	echo "    MAKE       FILO $(NAME-y)"
+	$(MAKE) -C filo
+
+libpayload: checkout
+	cd ../../libpayload && $(MAKE) defconfig && \
+		$(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install
+
+clean:
+	test -d filo && $(MAKE) -C filo clean || exit 0
+
+distclean:
+	rm -rf filo
+
+.PHONY: checkout config filo clean distclean
diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc
deleted file mode 100644
index 6a96a22455..0000000000
--- a/payloads/external/FILO/Makefile.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-TAG-$(CONFIG_FILO_MASTER)=origin/master
-NAME-$(CONFIG_FILO_MASTER)=MASTER
-TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646
-NAME-$(CONFIG_FILO_STABLE)=STABLE
-
-unexport KCONFIG_AUTOHEADER
-unexport KCONFIG_AUTOCONFIG
-unexport KCONFIG_DEPENDENCIES
-unexport KCONFIG_SPLITCONFIG
-unexport KCONFIG_TRISTATE
-unexport KCONFIG_NEGATIVES
-
-all: filo
-
-checkout:
-	echo "    GIT        FILO $(NAME-y)"
-	test -d filo || \
-		git clone http://review.coreboot.org/p/filo.git
-	cd filo && \
-		git checkout master && \
-		git remote update && \
-		test -n $(TAG-y) && \
-			git branch -f $(NAME-y) $(TAG-y) && \
-			git checkout $(NAME-y)
-
-config: libpayload
-	echo "    CONFIG     FILO $(NAME-y)"
-	$(MAKE) -C filo defconfig LIBCONFIG_PATH=../../../libpayload
-	# This shows how to force a previously unset .config option *on*
-	#echo "CONFIG_VGAHOOKS=y" >> filo/.config
-	# This shows how to force a previously set .config option *off*
-	#echo "# CONFIG_SMBIOS is not set" >> filo/.config
-	$(MAKE) -C filo oldconfig LIBCONFIG_PATH=../../../libpayload
-
-filo: config
-	echo "    MAKE       FILO $(NAME-y)"
-	$(MAKE) -C filo
-
-libpayload: checkout
-	cd ../../libpayload && $(MAKE) defconfig && \
-		$(MAKE) && $(MAKE) DESTDIR=../external/FILO/filo/build install
-
-clean:
-	test -d filo && $(MAKE) -C filo clean || exit 0
-
-distclean:
-	rm -rf filo
-
-.PHONY: checkout config filo clean distclean
diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
new file mode 100644
index 0000000000..11630c8469
--- /dev/null
+++ b/payloads/external/GRUB2/Makefile
@@ -0,0 +1,53 @@
+TAG-$(CONFIG_GRUB2_MASTER)=
+NAME-$(CONFIG_GRUB2_MASTER)=HEAD
+
+unexport KCONFIG_AUTOCONFIG
+unexport CFLAGS
+unexport CPPFLAGS
+unexport CCASFLAGS
+unexport CC
+unexport BUILD_CC
+unexport TARGET_CC
+unexport TARGET_CFLAGS
+unexport TARGET_CPPFLAGS
+unexport TARGET_STRIP
+unexport TARGET_OBJCOPY
+unexport HOST_CFLAGS
+unexport HOST_CPPFLAGS
+unexport HOST_CC
+
+
+all: grub2
+
+checkout:
+	echo "    GIT        GRUB2 $(NAME-y)"
+	test -d grub2 || \
+		git clone git://git.sv.gnu.org/grub.git grub2
+	cd grub2 && \
+		git checkout master && \
+		git pull; \
+		test -n "$(TAG-y)" && \
+			git branch -f $(NAME-y) $(TAG-y) && \
+			git checkout $(NAME-y) || true
+
+config: checkout
+	echo "    CONFIG     GRUB2 $(NAME-y)"
+	rm -rf grub2/build
+	mkdir grub2/build
+	cd grub2 && ./autogen.sh
+	cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \
+	TARGET_CC="$(CC)" \
+	TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot
+
+grub2: config
+	echo "    MAKE       GRUB2 $(NAME-y)"
+	$(MAKE) -C grub2/build CC="$(HOSTCC)"
+	$(MAKE) -C grub2/build default_payload.elf EXTRA_PAYLOAD_MODULES="$(GRUB2_EXTRA_MODULES)"
+
+clean:
+	test -d grub2 && $(MAKE) -C grub2 clean || exit 0
+
+distclean:
+	rm -rf grub2
+
+.PHONY: checkout config grub2 clean distclean
diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc
deleted file mode 100644
index 11630c8469..0000000000
--- a/payloads/external/GRUB2/Makefile.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-TAG-$(CONFIG_GRUB2_MASTER)=
-NAME-$(CONFIG_GRUB2_MASTER)=HEAD
-
-unexport KCONFIG_AUTOCONFIG
-unexport CFLAGS
-unexport CPPFLAGS
-unexport CCASFLAGS
-unexport CC
-unexport BUILD_CC
-unexport TARGET_CC
-unexport TARGET_CFLAGS
-unexport TARGET_CPPFLAGS
-unexport TARGET_STRIP
-unexport TARGET_OBJCOPY
-unexport HOST_CFLAGS
-unexport HOST_CPPFLAGS
-unexport HOST_CC
-
-
-all: grub2
-
-checkout:
-	echo "    GIT        GRUB2 $(NAME-y)"
-	test -d grub2 || \
-		git clone git://git.sv.gnu.org/grub.git grub2
-	cd grub2 && \
-		git checkout master && \
-		git pull; \
-		test -n "$(TAG-y)" && \
-			git branch -f $(NAME-y) $(TAG-y) && \
-			git checkout $(NAME-y) || true
-
-config: checkout
-	echo "    CONFIG     GRUB2 $(NAME-y)"
-	rm -rf grub2/build
-	mkdir grub2/build
-	cd grub2 && ./autogen.sh
-	cd grub2/build && ../configure BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \
-	TARGET_CC="$(CC)" \
-	TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os --with-platform=coreboot
-
-grub2: config
-	echo "    MAKE       GRUB2 $(NAME-y)"
-	$(MAKE) -C grub2/build CC="$(HOSTCC)"
-	$(MAKE) -C grub2/build default_payload.elf EXTRA_PAYLOAD_MODULES="$(GRUB2_EXTRA_MODULES)"
-
-clean:
-	test -d grub2 && $(MAKE) -C grub2 clean || exit 0
-
-distclean:
-	rm -rf grub2
-
-.PHONY: checkout config grub2 clean distclean
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 5a6f6254ad..5335db9c91 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -40,7 +40,7 @@ payload_revision-type := raw
 
 SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
 payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(top)/$(DOTCONFIG)
-	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
+	$(MAKE) -C payloads/external/SeaBIOS \
 			HOSTCC="$(HOSTCC)" \
 			CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \
 			CFLAGS="$(patsubst $(word $(SEABIOS_CC_OFFSET),$(CC_x86_32))%,,$(wordlist $(SEABIOS_CC_OFFSET),9999,$(CC_x86_32)))" \
@@ -64,12 +64,12 @@ payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out
 payloads/external/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
 
 payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(top)/$(DOTCONFIG) $(CBFSTOOL)
-	$(MAKE) -C payloads/external/depthcharge -f Makefile.inc \
+	$(MAKE) -C payloads/external/depthcharge \
 		BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
 		MFLAGS= MAKEFLAGS=
 
 filo:
-	$(MAKE) -C payloads/external/FILO -f Makefile.inc \
+	$(MAKE) -C payloads/external/FILO \
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
 			OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
@@ -81,7 +81,7 @@ payloads/external/FILO/filo/.config: filo
 payloads/external/FILO/filo/build/version.h: filo
 
 grub2:
-	$(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \
+	$(MAKE) -C payloads/external/GRUB2 \
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
 			OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
@@ -90,7 +90,7 @@ grub2:
 payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
 
 payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG)
-	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc \
+	$(MAKE) -C payloads/external/U-Boot \
 			CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
 			CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
 
@@ -105,7 +105,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
 endif
 
 payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG)
-	$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc all \
+	$(MAKE) -C payloads/external/Memtest86Plus all \
 		CC="$(CC_x86_32)" \
 		LD="$(LD_x86_32)" \
 		OBJCOPY="$(OBJCOPY_x86_32)" \
diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile
new file mode 100644
index 0000000000..ee79032313
--- /dev/null
+++ b/payloads/external/Memtest86Plus/Makefile
@@ -0,0 +1,42 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2016 Google Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+project_name=Memtest86+
+project_dir=$(CURDIR)/memtest86plus
+project_git_repo=https://review.coreboot.org/memtest86plus
+
+all: build
+
+$(project_dir):
+	echo "    Cloning $(project_name) from Git"
+	git clone $(project_git_repo) $(project_dir)
+
+fetch: $(project_dir)
+	cd $(project_dir); \
+		test -e '.git' && \
+		git fetch && \
+		git checkout origin/master
+
+build: fetch
+	echo "    MAKE       $(project_name)"
+	$(MAKE) -C $(project_dir) all
+
+clean:
+	test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
+
+distclean:
+	rm -rf $(project_dir)
+
+.PHONY: all build fetch clean distclean
diff --git a/payloads/external/Memtest86Plus/Makefile.inc b/payloads/external/Memtest86Plus/Makefile.inc
deleted file mode 100644
index ee79032313..0000000000
--- a/payloads/external/Memtest86Plus/Makefile.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2016 Google Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-project_name=Memtest86+
-project_dir=$(CURDIR)/memtest86plus
-project_git_repo=https://review.coreboot.org/memtest86plus
-
-all: build
-
-$(project_dir):
-	echo "    Cloning $(project_name) from Git"
-	git clone $(project_git_repo) $(project_dir)
-
-fetch: $(project_dir)
-	cd $(project_dir); \
-		test -e '.git' && \
-		git fetch && \
-		git checkout origin/master
-
-build: fetch
-	echo "    MAKE       $(project_name)"
-	$(MAKE) -C $(project_dir) all
-
-clean:
-	test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
-
-distclean:
-	rm -rf $(project_dir)
-
-.PHONY: all build fetch clean distclean
diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile
new file mode 100644
index 0000000000..0ac04d7a2f
--- /dev/null
+++ b/payloads/external/SeaBIOS/Makefile
@@ -0,0 +1,74 @@
+TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
+TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4
+TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID)
+
+unexport KCONFIG_AUTOHEADER
+unexport KCONFIG_AUTOCONFIG
+unexport KCONFIG_DEPENDENCIES
+unexport KCONFIG_SPLITCONFIG
+unexport KCONFIG_TRISTATE
+unexport KCONFIG_NEGATIVES
+
+all: build
+
+seabios:
+	echo "    Cloning SeaBIOS from Git"
+	git clone http://review.coreboot.org/p/seabios.git seabios
+
+fetch: seabios
+ifeq ($(TAG-y),)
+	echo "Error: The specified tag is invalid"
+ifeq ($(CONFIG_SEABIOS_REVISION),y)
+	echo "Error: There is no revision specified for SeaBIOS"
+	false
+endif
+	false
+endif
+	cd seabios; git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ] || \
+		[ "$(TAG-y)" = "origin/master" ]; 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)"
+	echo "CONFIG_COREBOOT=y" > seabios/.config
+ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
+	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" >> seabios/.config
+endif
+ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
+	echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config
+endif
+ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y)
+	echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config
+	echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config
+endif
+ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
+ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
+	cat $(CONFIG_PAYLOAD_CONFIGFILE) >> seabios/.config
+else
+	echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
+	false
+endif
+endif
+	# This shows how to force a previously set .config option *off*
+	#echo "# CONFIG_SMBIOS is not set" >> seabios/.config
+	$(MAKE) -C seabios olddefconfig OUT=out/
+
+build: config
+	echo "    MAKE       SeaBIOS $(TAG-y)"
+	$(MAKE) -C seabios OUT=out/
+
+clean:
+	test -d seabios/out && rm -rf seabios/out || exit 0
+
+distclean:
+	rm -rf seabios
+
+.PHONY: checkout config build clean distclean clone fetch
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
deleted file mode 100644
index 0ac04d7a2f..0000000000
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
-TAG-$(CONFIG_SEABIOS_STABLE)=b3ef39f532db52bf17457ba931da758eeb38d6b4
-TAG-$(CONFIG_SEABIOS_REVISION)=$(CONFIG_SEABIOS_REVISION_ID)
-
-unexport KCONFIG_AUTOHEADER
-unexport KCONFIG_AUTOCONFIG
-unexport KCONFIG_DEPENDENCIES
-unexport KCONFIG_SPLITCONFIG
-unexport KCONFIG_TRISTATE
-unexport KCONFIG_NEGATIVES
-
-all: build
-
-seabios:
-	echo "    Cloning SeaBIOS from Git"
-	git clone http://review.coreboot.org/p/seabios.git seabios
-
-fetch: seabios
-ifeq ($(TAG-y),)
-	echo "Error: The specified tag is invalid"
-ifeq ($(CONFIG_SEABIOS_REVISION),y)
-	echo "Error: There is no revision specified for SeaBIOS"
-	false
-endif
-	false
-endif
-	cd seabios; git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ] || \
-		[ "$(TAG-y)" = "origin/master" ]; 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)"
-	echo "CONFIG_COREBOOT=y" > seabios/.config
-ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
-	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" >> seabios/.config
-endif
-ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
-	echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config
-endif
-ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y)
-	echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config
-	echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config
-endif
-ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
-ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
-	cat $(CONFIG_PAYLOAD_CONFIGFILE) >> seabios/.config
-else
-	echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
-	false
-endif
-endif
-	# This shows how to force a previously set .config option *off*
-	#echo "# CONFIG_SMBIOS is not set" >> seabios/.config
-	$(MAKE) -C seabios olddefconfig OUT=out/
-
-build: config
-	echo "    MAKE       SeaBIOS $(TAG-y)"
-	$(MAKE) -C seabios OUT=out/
-
-clean:
-	test -d seabios/out && rm -rf seabios/out || exit 0
-
-distclean:
-	rm -rf seabios
-
-.PHONY: checkout config build clean distclean clone fetch
diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile
new file mode 100644
index 0000000000..255db297ff
--- /dev/null
+++ b/payloads/external/U-Boot/Makefile
@@ -0,0 +1,82 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2015 Google Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+# 2016-1 tag
+STABLE_COMMIT_ID=fa85e826c16b9ce1ad302a57e9c4b24db0d8b930
+
+TAG-$(CONFIG_UBOOT_MASTER)=origin/master
+TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID)
+
+project_name=U-Boot
+project_dir=u-boot
+project_git_repo=http://git.denx.de/u-boot.git
+project_config_file=$(project_dir)/.config
+
+unexport KCONFIG_AUTOHEADER
+unexport KCONFIG_AUTOCONFIG
+unexport KCONFIG_DEPENDENCIES
+unexport KCONFIG_SPLITCONFIG
+unexport KCONFIG_TRISTATE
+unexport KCONFIG_NEGATIVES
+
+all: build
+
+$(project_dir):
+	echo "    Cloning $(project_name) from Git"
+	git clone $(project_git_repo) $(project_dir)
+
+fetch: $(project_dir)
+ifeq ($(CONFIG_UBOOT_MASTER),y)
+	echo "    Fetching new commits from the $(project_name) git repo"
+	git fetch
+
+	#master doesn't get a file, so it's continuously updated
+	rm -f $(project_dir)/$(STABLE_COMMIT_ID)
+else
+	cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ]; \
+	then echo "    Fetching new commits from the $(project_name) git repo"; git fetch; fi
+	touch $(project_dir)/$(STABLE_COMMIT_ID)
+endif
+
+$(project_dir)/tag-$(TAG-y): fetch
+	echo "    Checking out $(project_name) revision $(TAG-y)"
+	cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
+
+config: $(project_dir)/$(TAG-y)
+	rm -f $(project_config_file)
+ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
+ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
+	cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file)
+else
+	echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
+	false
+endif
+else
+	cat $(project_dir)/configs/coreboot-x86_defconfig >> $(project_config_file)
+endif
+
+	$(MAKE) -C $(project_dir) olddefconfig
+
+build: config
+	echo "    MAKE       $(project_name) $(TAG-y)"
+	$(MAKE) -C $(project_dir)
+
+clean:
+	test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
+
+distclean:
+	rm -rf $(project_dir)
+
+.PHONY: config build clean distclean fetch
diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile.inc
deleted file mode 100644
index 255db297ff..0000000000
--- a/payloads/external/U-Boot/Makefile.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2015 Google Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-# 2016-1 tag
-STABLE_COMMIT_ID=fa85e826c16b9ce1ad302a57e9c4b24db0d8b930
-
-TAG-$(CONFIG_UBOOT_MASTER)=origin/master
-TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID)
-
-project_name=U-Boot
-project_dir=u-boot
-project_git_repo=http://git.denx.de/u-boot.git
-project_config_file=$(project_dir)/.config
-
-unexport KCONFIG_AUTOHEADER
-unexport KCONFIG_AUTOCONFIG
-unexport KCONFIG_DEPENDENCIES
-unexport KCONFIG_SPLITCONFIG
-unexport KCONFIG_TRISTATE
-unexport KCONFIG_NEGATIVES
-
-all: build
-
-$(project_dir):
-	echo "    Cloning $(project_name) from Git"
-	git clone $(project_git_repo) $(project_dir)
-
-fetch: $(project_dir)
-ifeq ($(CONFIG_UBOOT_MASTER),y)
-	echo "    Fetching new commits from the $(project_name) git repo"
-	git fetch
-
-	#master doesn't get a file, so it's continuously updated
-	rm -f $(project_dir)/$(STABLE_COMMIT_ID)
-else
-	cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ]; \
-	then echo "    Fetching new commits from the $(project_name) git repo"; git fetch; fi
-	touch $(project_dir)/$(STABLE_COMMIT_ID)
-endif
-
-$(project_dir)/tag-$(TAG-y): fetch
-	echo "    Checking out $(project_name) revision $(TAG-y)"
-	cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
-
-config: $(project_dir)/$(TAG-y)
-	rm -f $(project_config_file)
-ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
-ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
-	cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file)
-else
-	echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
-	false
-endif
-else
-	cat $(project_dir)/configs/coreboot-x86_defconfig >> $(project_config_file)
-endif
-
-	$(MAKE) -C $(project_dir) olddefconfig
-
-build: config
-	echo "    MAKE       $(project_name) $(TAG-y)"
-	$(MAKE) -C $(project_dir)
-
-clean:
-	test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
-
-distclean:
-	rm -rf $(project_dir)
-
-.PHONY: config build clean distclean fetch
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
new file mode 100644
index 0000000000..4e766870fc
--- /dev/null
+++ b/payloads/external/depthcharge/Makefile
@@ -0,0 +1,71 @@
+# release-R50-7978.B
+STABLE_COMMIT_ID=124af94fa5599a0698e59bf3d73675eb52fc6879
+
+project_name=depthcharge
+project_dir=$(CURDIR)/depthcharge
+project_git_repo=https://chromium.googlesource.com/chromiumos/platform/depthcharge
+project_config_file=$(project_dir)/.config
+output_dir=$(project_dir)/build
+libpayload_dir=$(abspath $(CURDIR)/../../libpayload)
+libpayload_install_dir=$(output_dir)/lp_$(BOARD)
+vboot_dir=$(abspath $(CURDIR)/../../../3rdparty/vboot)
+
+TAG-$(DEPTHCHARGE_MASTER)=origin/master
+TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)
+
+unexport KCONFIG_AUTOHEADER
+unexport KCONFIG_AUTOCONFIG
+unexport KCONFIG_DEPENDENCIES
+unexport KCONFIG_SPLITCONFIG
+unexport KCONFIG_TRISTATE
+unexport KCONFIG_NEGATIVES
+unexport src srck obj objk
+
+BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR))
+
+all: build
+
+$(project_dir):
+	echo "    Cloning $(project_name) from Git"
+	git clone $(project_git_repo)
+
+fetch: $(project_dir)
+	cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ] || \
+		[ "$(TAG-y)" = "origin/master" ]; then \
+		echo "    Fetching new commits from the $(project_name) git repo"; \
+		git fetch; fi
+
+checkout: fetch
+	echo "    Checking out $(project_name) revision $(TAG-y)"
+	cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
+
+$(libpayload_install_dir): $(project_dir)
+	test -f $(libpayload_dir)/configs/config.$(BOARD) || \
+		(echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \
+		false)
+	cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config
+	$(MAKE) -C $(libpayload_dir) olddefconfig
+	$(MAKE) -C $(libpayload_dir)
+	$(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)
+#	rm -f $(libpayload_dir)/.config
+
+config: $(libpayload_install_dir) checkout
+	echo "    CONFIG     project_name $(TAG-y)"
+	export VERSION=$$(cd depthcharge && \
+		git describe --tags --long --dirty 2>/dev/null || \
+		echo "unknown") ; \
+	cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
+		VB_SOURCE=$(vboot_dir) defconfig
+
+build: config
+	echo "    MAKE       $(project_name) $(TAG-y)"
+	cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
+		VB_SOURCE=$(vboot_dir) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified
+
+clean:
+	test -d $(output_dir) && rm -rf $(output_dir) || exit 0
+
+distclean:
+	rm -rf $(project_dir)
+
+.PHONY: checkout config build clean distclean clone fetch
diff --git a/payloads/external/depthcharge/Makefile.inc b/payloads/external/depthcharge/Makefile.inc
deleted file mode 100644
index 4e766870fc..0000000000
--- a/payloads/external/depthcharge/Makefile.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-# release-R50-7978.B
-STABLE_COMMIT_ID=124af94fa5599a0698e59bf3d73675eb52fc6879
-
-project_name=depthcharge
-project_dir=$(CURDIR)/depthcharge
-project_git_repo=https://chromium.googlesource.com/chromiumos/platform/depthcharge
-project_config_file=$(project_dir)/.config
-output_dir=$(project_dir)/build
-libpayload_dir=$(abspath $(CURDIR)/../../libpayload)
-libpayload_install_dir=$(output_dir)/lp_$(BOARD)
-vboot_dir=$(abspath $(CURDIR)/../../../3rdparty/vboot)
-
-TAG-$(DEPTHCHARGE_MASTER)=origin/master
-TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)
-
-unexport KCONFIG_AUTOHEADER
-unexport KCONFIG_AUTOCONFIG
-unexport KCONFIG_DEPENDENCIES
-unexport KCONFIG_SPLITCONFIG
-unexport KCONFIG_TRISTATE
-unexport KCONFIG_NEGATIVES
-unexport src srck obj objk
-
-BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR))
-
-all: build
-
-$(project_dir):
-	echo "    Cloning $(project_name) from Git"
-	git clone $(project_git_repo)
-
-fetch: $(project_dir)
-	cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ;	if [ $$? -ne 0 ] || \
-		[ "$(TAG-y)" = "origin/master" ]; then \
-		echo "    Fetching new commits from the $(project_name) git repo"; \
-		git fetch; fi
-
-checkout: fetch
-	echo "    Checking out $(project_name) revision $(TAG-y)"
-	cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
-
-$(libpayload_install_dir): $(project_dir)
-	test -f $(libpayload_dir)/configs/config.$(BOARD) || \
-		(echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \
-		false)
-	cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config
-	$(MAKE) -C $(libpayload_dir) olddefconfig
-	$(MAKE) -C $(libpayload_dir)
-	$(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)
-#	rm -f $(libpayload_dir)/.config
-
-config: $(libpayload_install_dir) checkout
-	echo "    CONFIG     project_name $(TAG-y)"
-	export VERSION=$$(cd depthcharge && \
-		git describe --tags --long --dirty 2>/dev/null || \
-		echo "unknown") ; \
-	cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
-		VB_SOURCE=$(vboot_dir) defconfig
-
-build: config
-	echo "    MAKE       $(project_name) $(TAG-y)"
-	cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \
-		VB_SOURCE=$(vboot_dir) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" depthcharge_unified
-
-clean:
-	test -d $(output_dir) && rm -rf $(output_dir) || exit 0
-
-distclean:
-	rm -rf $(project_dir)
-
-.PHONY: checkout config build clean distclean clone fetch
-- 
cgit v1.2.3