summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-09-25 13:18:52 +0200
committerArthur Heymans <arthur@aheymans.xyz>2019-09-28 12:14:12 +0000
commit965881b7ce202b8d1e114d23d90a156b9d6e2573 (patch)
tree3f578cf4bfec605e8aab4b943310c2c6ea7b2508
parentef2e86edeba667dcb41fb5a752f695d603e5e5f0 (diff)
downloadcoreboot-965881b7ce202b8d1e114d23d90a156b9d6e2573.tar.xz
Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided
CONFIG_CBFS_SIZE should only be used as a parameter to generate the default FMAP. This also swaps around FMDFILE and CBFS_SIZE to avoid that the CBFS_SIZE entry disappears when filling in the FMDFILE entry below it. One advantage is that if code references CONFIG_CBFS_SIZE the jenkins buildtest will most likely fail as many boards provide an FMD file. Change-Id: Ic7926e1638d7fb49ba61af28d682315786c3c39e Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35597 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
-rw-r--r--src/Kconfig22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Kconfig b/src/Kconfig
index a1c016e30f..8fcb3ae8a3 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -346,8 +346,18 @@ config OVERRIDE_DEVICETREE
Examples: "devicetree.variant-override.cb"
"variant/devicetree-override.cb"
+config FMDFILE
+ string "fmap description file in fmd format"
+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS
+ default ""
+ help
+ The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
+ but in some cases more complex setups are required.
+ When an fmd is specified, it overrides the default format.
+
config CBFS_SIZE
hex "Size of CBFS filesystem in ROM"
+ depends on FMDFILE = ""
# Default value set at the end of the file
help
This is the part of the ROM actually managed by CBFS, located at the
@@ -356,16 +366,8 @@ config CBFS_SIZE
to span the whole ROM on all but Intel systems that use an Intel Firmware
Descriptor. It can be overridden to make coreboot live alongside other
components like ChromeOS's vboot/FMAP or Intel's IFD / ME / TXE
- binaries.
-
-config FMDFILE
- string "fmap description file in fmd format"
- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS
- default ""
- help
- The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,
- but in some cases more complex setups are required.
- When an fmd is specified, it overrides the default format.
+ binaries. This symbol should only be used to generate a default FMAP and
+ is unused when a non-default fmd file is provided via CONFIG_FMDFILE.
endmenu