Change in coreboot[master]: Kconfig: Add an option to ommit a cbfs master header

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63378 )

Change subject: Kconfig: Add an option to ommit a cbfs master header
......................................................................

Kconfig: Add an option to ommit a cbfs master header

The CBFS master header is legacy feature that has no internal use in
coreboot. Some payloads do depend on it however.

Change-Id: Ib3d5b32412db40df48c0ed4dd6216bdd9cb955e2
Signed-off-by: Arthur Heymans 
---
M src/Kconfig
M src/lib/Makefile.inc
2 files changed, 10 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/63378/1

diff --git a/src/Kconfig b/src/Kconfig
index eb1cac5..ae33e60 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -463,6 +463,14 @@
    help
      If this option is enabled, coreboot will scan only PCI devices
      marked as mandatory in devicetree.cb
+
+config CBFS_MASTER_HEADER
+	bool "Include a legacy cbfs master header"
+	default y
+	help
+	  Some payloads depend on this legacy interface. Payloads should use the active
+	  region exposed in COREBOOT tables.
+
 endmenu

menu "Mainboard"
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 71a9d93..299bc9d 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -394,13 +394,13 @@

romstage-$(CONFIG_SPD_CACHE_IN_FMAP) += spd_cache.c

-cbfs-files-y += cbfs_master_header
+cbfs-files-$(CONFIG_CBFS_MASTER_HEADER) += cbfs_master_header
 cbfs_master_header-file := cbfs_master_header.c:struct
 cbfs_master_header-type := "cbfs header"
 cbfs_master_header-position := 0

ifneq ($(CONFIG_TOP_ALIGNED_CBFS_BOOTBLOCK),y)
-cbfs-files-y += header_pointer
+cbfs-files-$(CONFIG_CBFS_MASTER_HEADER) += header_pointer
 header_pointer-file := master_header_pointer.c:struct
 header_pointer-position := -4
 header_pointer-type := "cbfs header"