Change in coreboot[master]: Revert "Makefile.inc: Drop the cbfs master header from non-X86"

[Julius Werner (Code Review)]

Attention is currently required from: Hung-Te Lin, Martin Roth, Arthur Heymans, Yu-Ping Wu.
Hello Hung-Te Lin, build bot (Jenkins), Patrick Georgi, Martin Roth, Arthur Heymans, Yu-Ping Wu,

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

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

to review the following change.

Change subject: Revert "Makefile.inc: Drop the cbfs master header from non-X86"
......................................................................

Revert "Makefile.inc: Drop the cbfs master header from non-X86"

This reverts commit d109354c0f1d4b155c60701cd42e632213350d72.

Reason for revert: Breaks libpayload CBFS code when accessing
non-primary CBFS.

BUG=b:193093750

Change-Id: Id7f47406e6126f19e1fd6bc9d33c8c9d0cb9450d
---
M Makefile.inc
1 file changed, 9 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/56130/1

diff --git a/Makefile.inc b/Makefile.inc
index fee73f5..b1c7067 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1101,15 +1101,22 @@
    	-b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \
    	$(TS_OPTIONS) \
    	$(CBFSTOOL_ADD_CMD_OPTIONS)
-	# the cbfs master header is a deprecated feature only used on x86
-	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
 else # ifeq ($(CONFIG_ARCH_X86),y)
    $(CBFSTOOL) $@.tmp 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.2
+	$(CBFSTOOL) $@.tmp add \
+		-f $@.tmp.2 \
+		-n "header pointer" \
+		-t "cbfs header" \
+		-b -4 \
+		$(CBFSTOOL_ADD_CMD_OPTIONS)
+	rm -f $@.tmp.2
 endif # ifeq ($(CONFIG_ARCH_X86),y)
+	$(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
    $(prebuild-files) true
    mv $@.tmp $@
 else # ifneq ($(CONFIG_UPDATE_IMAGE),y)