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

[Arthur Heymans (Code Review)]

Attention is currently required from: Martin Roth.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56120 )

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

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

The pointer to the header has a x86 top mmaped address even though the
boot medium is not mapped that way. If no pointer is used to find the
header FMAP is needed. If FMAP is used anyway there is no need for a
cbfs master header.

Change-Id: I6d693bdd4ddaf4c9b3cffb4ea9879c761200aca9
Signed-off-by: Arthur Heymans 
---
M Makefile.inc
M src/arch/x86/Makefile.inc
2 files changed, 7 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/56120/1

diff --git a/Makefile.inc b/Makefile.inc
index 3fedca3..340dc31 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1122,28 +1122,15 @@
    $(eval INTERMEDIATE+=$(1)) $(eval PHONY+=$(1))

ifneq ($(CONFIG_UPDATE_IMAGE),y)
-$(call add_intermediate, update_master_header, add_bootblock add_cbfs_ptr)
-	printf "    CBFS       Updating master header\n"
-	$(CBFSTOOL) $< add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
-
 ifneq ($(CONFIG_ARCH_X86),y)
-$(call add_intermediate, add_cbfs_ptr, add_bootblock)
-	printf "ptr_" > $@.tmp
-	$(CBFSTOOL) $< add \
-		-f $@.tmp \
-		-n "header pointer" \
-		-t "cbfs header" \
-		-b -4 \
-		$(CBFSTOOL_ADD_CMD_OPTIONS)
-	rm $@.tmp
-
 $(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin)
    printf "    FMAP       BOOTBLOCK adding bootblock\n"
    $(CBFSTOOL) $< write -u \
    	-r BOOTBLOCK \
    	-f $(objcbfs)/bootblock.bin
-else
-$(call add_intermediate, add_cbfs_ptr, add_bootblock)
+
+# The master header is not used on non-X86
+$(call add_intermediate, update_master_header, add_bootblock)
    true
 endif # ARCH_X86
 endif # UPDATE_IMAGE
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 54731ea..6f94511 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -86,6 +86,10 @@
 bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c

ifneq ($(CONFIG_UPDATE_IMAGE),y)
+$(call add_intermediate, update_master_header, add_bootblock)
+	printf "    CBFS       Updating master header\n"
+	$(CBFSTOOL) $< add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
+
 $(call add_intermediate, add_bootblock, $(objcbfs)/bootblock.bin)
    $(CBFSTOOL) $< add \
    	-f $(objcbfs)/bootblock.bin \