New patch to review for coreboot: SeaBIOS: Rename Makefile.inc to Makefile

[Martin Roth]

Martin Roth ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10605

-gerrit

commit b553c16bab7cd23983e607d7db30f85eea94577a
Author: Martin Roth 
Date:   Fri Jun 19 20:20:27 2015 -0600

SeaBIOS: Rename Makefile.inc to Makefile

The payloads/external/SeaBIOS/Makefile.inc is not actually included
    in the rest of the coreboot Makefile tree, it's called out explicitly
    when doing the build.

Because of this, the standard CONFIG_ variables need to be passed
    to it on the command line instead of just being available.  Since
    it's named .inc, it would be expected that similar to other Makefile.inc
    files, these would just be available for use.

Change-Id: I64de18f9e0d88d188705b53921e9e12c2f37f71d
    Signed-off-by: Martin Roth 
---
 payloads/external/SeaBIOS/Makefile     | 81 ++++++++++++++++++++++++++++++++++
 payloads/external/SeaBIOS/Makefile.inc | 81 ----------------------------------
 src/arch/x86/Makefile.inc              |  2 +-
 3 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile
new file mode 100644
index 0000000..7cd2b03
--- /dev/null
+++ b/payloads/external/SeaBIOS/Makefile
@@ -0,0 +1,81 @@
+TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
+TAG-$(CONFIG_SEABIOS_STABLE)=e51488c5f8800a52ac5c8da7a31b85cca5cc95d2
+
+unexport KCONFIG_AUTOHEADER
+unexport KCONFIG_AUTOCONFIG
+unexport KCONFIG_DEPENDENCIES
+unexport KCONFIG_SPLITCONFIG
+unexport KCONFIG_TRISTATE
+unexport KCONFIG_NEGATIVES
+
+all: build
+
+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)"
+	echo "CONFIG_COREBOOT=y" > seabios/.config
+ifeq ($(CONFIG_CONSOLE_SERIAL),y)
+	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_MALLOC_UPPERMEMORY),y)
+	echo "# CONFIG_MALLOC_UPPERMEMORY 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
+	# 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/
+
+ifeq ($(CONFIG_SEABIOS_USER_MANAGED),)
+
+seabios:
+	echo "    Cloning SeaBIOS from Git"
+	git clone http://review.coreboot.org/p/seabios.git seabios
+
+build: config
+	echo "    MAKE       SeaBIOS $(TAG-y)"
+	$(MAKE) -C seabios OUT=out/
+
+else # User-managed SeaBIOS configuration
+
+seabios:
+	@printf "\nError: No local version of SeaBIOS exists in:\n"
+	@printf "       $$(pwd)/seabios\n"
+	@printf "       Please select a different version of SeaBIOS in Kconfig\n"
+	@printf "       or put a copy of SeaBIOS in that location.\n\n"
+	false # halt the build.
+
+seabios/.config:
+	@printf "\nError: SeaBIOS .config does not exist.  Run the SeaBIOS 'make menuconfig'.\n\n"
+	false # halt the build.
+
+seabios/out/bios.bin.elf: seabios/.config
+	echo "    MAKE       SeaBIOS"
+	$(MAKE) -C seabios OUT=out/
+
+build: seabios seabios/out/bios.bin.elf
+
+endif # User-managed SeaBIOS configuration
+
+clean:
+	test -d seabios && $(MAKE) -C seabios clean OUT=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 7cd2b03..0000000
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-TAG-$(CONFIG_SEABIOS_MASTER)=origin/master
-TAG-$(CONFIG_SEABIOS_STABLE)=e51488c5f8800a52ac5c8da7a31b85cca5cc95d2
-
-unexport KCONFIG_AUTOHEADER
-unexport KCONFIG_AUTOCONFIG
-unexport KCONFIG_DEPENDENCIES
-unexport KCONFIG_SPLITCONFIG
-unexport KCONFIG_TRISTATE
-unexport KCONFIG_NEGATIVES
-
-all: build
-
-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)"
-	echo "CONFIG_COREBOOT=y" > seabios/.config
-ifeq ($(CONFIG_CONSOLE_SERIAL),y)
-	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_MALLOC_UPPERMEMORY),y)
-	echo "# CONFIG_MALLOC_UPPERMEMORY 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
-	# 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/
-
-ifeq ($(CONFIG_SEABIOS_USER_MANAGED),)
-
-seabios:
-	echo "    Cloning SeaBIOS from Git"
-	git clone http://review.coreboot.org/p/seabios.git seabios
-
-build: config
-	echo "    MAKE       SeaBIOS $(TAG-y)"
-	$(MAKE) -C seabios OUT=out/
-
-else # User-managed SeaBIOS configuration
-
-seabios:
-	@printf "\nError: No local version of SeaBIOS exists in:\n"
-	@printf "       $$(pwd)/seabios\n"
-	@printf "       Please select a different version of SeaBIOS in Kconfig\n"
-	@printf "       or put a copy of SeaBIOS in that location.\n\n"
-	false # halt the build.
-
-seabios/.config:
-	@printf "\nError: SeaBIOS .config does not exist.  Run the SeaBIOS 'make menuconfig'.\n\n"
-	false # halt the build.
-
-seabios/out/bios.bin.elf: seabios/.config
-	echo "    MAKE       SeaBIOS"
-	$(MAKE) -C seabios OUT=out/
-
-build: seabios seabios/out/bios.bin.elf
-
-endif # User-managed SeaBIOS configuration
-
-clean:
-	test -d seabios && $(MAKE) -C seabios clean OUT=out/ || exit 0
-
-distclean:
-	rm -rf seabios
-
-.PHONY: checkout config build clean distclean clone fetch
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index cd5d2b3..239563a 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -310,7 +310,7 @@ endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64
 ################################################################################

seabios:
-	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
+	$(MAKE) -C payloads/external/SeaBIOS -f Makefile \
    		HOSTCC="$(HOSTCC)" \
    		CC=$(word 1,$(CC_x86_32)) CFLAGS="$(patsubst $(word 1,$(CC_x86_32))%,,$(CC_x86_32))" \
    		LD=$(word 1,$(LD_x86_32)) LDFLAGS="$(patsubst $(word 1,$(LD_x86_32))%,,$(LD_x86_32))" \