From 965881b7ce202b8d1e114d23d90a156b9d6e2573 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 25 Sep 2019 13:18:52 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35597 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Werner Zeh --- src/Kconfig | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index a1c016e30f..8fcb3ae8a3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -346,18 +346,6 @@ config OVERRIDE_DEVICETREE Examples: "devicetree.variant-override.cb" "variant/devicetree-override.cb" -config CBFS_SIZE - hex "Size of CBFS filesystem in ROM" - # Default value set at the end of the file - help - This is the part of the ROM actually managed by CBFS, located at the - end of the ROM (passed through cbfstool -o) on x86 and at at the start - of the ROM (passed through cbfstool -s) everywhere else. It defaults - 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 @@ -367,6 +355,20 @@ config FMDFILE 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 + end of the ROM (passed through cbfstool -o) on x86 and at at the start + of the ROM (passed through cbfstool -s) everywhere else. It defaults + 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. 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 # load site-local kconfig to allow user specific defaults and overrides