You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 9d85a5a984086d38632bd749c8ba18e320433b49 Mon Sep 17 00:00:00 2001
|
|
From: Nico Huber <nico.h@gmx.de>
|
|
Subject: [PATCH 01/22] [CHERRY-PICK] Makefile.inc: Use `define` for
|
|
cbfs-files-processor-defconfig
|
|
|
|
The body contains a `#` and GNU make 4.3 disagrees with earlier versions
|
|
if it should be treated as a comment. Turn it into a `define` which has
|
|
clearer semantics regarding comments (interpretation is supposed to be
|
|
deferred until the variable is expanded).
|
|
|
|
Change-Id: I589542abbd14082c3ecc4a2456ebd809fb6911ea
|
|
Signed-off-by: Nico Huber <nico.h@gmx.de>
|
|
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38793
|
|
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
|
|
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
|
|
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
|
|
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
|
---
|
|
Makefile.inc | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
|
index b25ac6b426..7e1f3a5456 100644
|
|
--- a/Makefile.inc
|
|
+++ b/Makefile.inc
|
|
@@ -286,15 +286,16 @@ cbfs-files-processor-vsa= \
|
|
# Reduce a .config file to its minimal representation
|
|
# arg1: input
|
|
# arg2: output
|
|
-cbfs-files-processor-defconfig= \
|
|
+define cbfs-files-processor-defconfig
|
|
$(eval $(2): $(1) $(obj)/build.h $(objutil)/kconfig/conf; \
|
|
+printf " CREATE $(2) (from $(1))\n"; \
|
|
- printf "\# This image was built using coreboot " > $(2).tmp && \
|
|
+ printf "# This image was built using coreboot " > $(2).tmp && \
|
|
grep "\<COREBOOT_VERSION\>" $(obj)/build.h |cut -d\" -f2 >> $(2).tmp && \
|
|
$(MAKE) DOTCONFIG=$(1) DEFCONFIG=$(2).tmp2 savedefconfig && \
|
|
cat $(2).tmp2 >> $(2).tmp && \
|
|
rm -f $(2).tmp2 && \
|
|
\mv -f $(2).tmp $(2))
|
|
+endef
|
|
|
|
#######################################################################
|
|
# Compile a C file with a bare struct definition into binary
|
|
--
|
|
2.36.1
|
|
|