[coreboot-gerrit] Patch set updated for coreboot: SeaBIOS: Rename Makefile.inc to Makefile
Martin Roth (gaumless@gmail.com)
gerrit at coreboot.org
Thu Jun 25 04:08:06 CEST 2015
Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10605
-gerrit
commit e18413e9bacf5de2364c6fd4c63bdedf2df5b2eb
Author: Martin Roth <gaumless at gmail.com>
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 <gaumless at gmail.com>
---
Makefile.inc | 2 +-
payloads/external/SeaBIOS/Makefile | 61 ++++++++++++++++++++++++++++++++++
payloads/external/SeaBIOS/Makefile.inc | 61 ----------------------------------
src/arch/x86/Makefile.inc | 2 +-
4 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index eb5cc65..783d172 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -381,7 +381,7 @@ clean-for-update-target:
rm -f $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.*
rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm
- $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean
+ $(MAKE) -C payloads/external/SeaBIOS -f Makefile clean
clean-target:
rm -f $(obj)/coreboot*
diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile
new file mode 100644
index 0000000..7fb63d4
--- /dev/null
+++ b/payloads/external/SeaBIOS/Makefile
@@ -0,0 +1,61 @@
+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
+
+seabios:
+ echo " Cloning SeaBIOS from Git"
+ git clone http://review.coreboot.org/p/seabios.git seabios
+
+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/
+
+build: config
+ echo " MAKE SeaBIOS $(TAG-y)"
+ export VERSION=$$(cd seabios && \
+ git describe --tags --long --dirty 2>/dev/null || \
+ echo "unknown") ; \
+ $(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 7fb63d4..0000000
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ /dev/null
@@ -1,61 +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
-
-seabios:
- echo " Cloning SeaBIOS from Git"
- git clone http://review.coreboot.org/p/seabios.git seabios
-
-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/
-
-build: config
- echo " MAKE SeaBIOS $(TAG-y)"
- export VERSION=$$(cd seabios && \
- git describe --tags --long --dirty 2>/dev/null || \
- echo "unknown") ; \
- $(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/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index eaab2de..c5b92d4 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -327,7 +327,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))" \
More information about the coreboot-gerrit
mailing list