[coreboot-gerrit] Change in coreboot[master]: Makefile.inc: Add a master header pointer as a regular cbfs file

[Arthur Heymans (Code Review)]

Attention is currently required from: Martin Roth, Arthur Heymans.
Hello Arthur Heymans,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/59133

to review the following change.

Change subject: Makefile.inc: Add a master header pointer as a regular cbfs file
......................................................................

Makefile.inc: Add a master header pointer as a regular cbfs file

Change-Id: I99b8d4e2b4e9109b239804c86a1911ba916bd966
Signed-off-by: Arthur Heymans 
---
M Makefile.inc
1 file changed, 10 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/59133/1

diff --git a/Makefile.inc b/Makefile.inc
index 723e34c..eae6868 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1139,17 +1139,16 @@
    $(CBFSTOOL) $< write -u \
    	-r BOOTBLOCK \
    	-f $(objcbfs)/bootblock.bin
-	# make space for the CBFS master header pointer. "ptr_" is just
-	# arbitrary 4 bytes that will be overwritten by add-master-header.
-	printf "ptr_" > $@.tmp
-	$(CBFSTOOL) $< add \
-		-f $@.tmp \
-		-n "header pointer" \
-		-t "cbfs header" \
-		-b -4 \
-		$(CBFSTOOL_ADD_CMD_OPTIONS)
-	rm -f $@.tmp
-endif # ARCH_X86
+
+$(obj)/header_pointer:
+	printf "ptr_" > $@
+
+cbfs-files-y += header_pointer
+header_pointer-file := $(obj)/header_pointer
+header_pointer-position := -4
+header_pointer-type := "cbfs header"
+
+endif # !ARCH_X86
 endif # UPDATE_IMAGE

$(call add_intermediate, add_prebuild_files, $$(prebuilt-files))