Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for
CONFIG_CBFS_SIZE should only be used as a parameter to generate the default FMAP.
Change-Id: Ic7926e1638d7fb49ba61af28d682315786c3c39e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/Kconfig 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/35597/1
diff --git a/src/Kconfig b/src/Kconfig index a1c016e..e9287d3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -356,7 +356,8 @@ 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. + binaries. This symbol should only used to generate a default FMAP and + is unused when a separate fmd file is specified.
config FMDFILE string "fmap description file in fmd format"
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Patch Set 1: Code-Review+1
(2 comments)
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig File src/Kconfig:
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig@359 PS1, Line 359: be
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig@360 PS1, Line 360: separate maybe change to "specific"?
Hello Werner Zeh, build bot (Jenkins), Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35597
to look at the new patch set (#2).
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for
CONFIG_CBFS_SIZE should only be used as a parameter to generate the default FMAP.
Change-Id: Ic7926e1638d7fb49ba61af28d682315786c3c39e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/Kconfig 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/35597/2
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Patch Set 2: Code-Review+2
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig File src/Kconfig:
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig@359 PS1, Line 359:
be
Done
https://review.coreboot.org/c/coreboot/+/35597/1/src/Kconfig@360 PS1, Line 360: separate
maybe change to "specific"?
Done
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Patch Set 2: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Make it more clear what CONFIG_CBFS_SIZE is for ......................................................................
Patch Set 2: Code-Review+2
Hello Werner Zeh, Paul Menzel, build bot (Jenkins), Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35597
to look at the new patch set (#3).
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
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.
Change-Id: Ic7926e1638d7fb49ba61af28d682315786c3c39e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/Kconfig 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/35597/3
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
Patch Set 3: Code-Review+2
Maybe switch the order? So that the CBFS_SIZE prompt doesn't vanish when you change an option below it? (I don't like it when Kconfig does that to me oO)
Hello Werner Zeh, Paul Menzel, build bot (Jenkins), Nico Huber, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35597
to look at the new patch set (#4).
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
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.
Change-Id: Ic7926e1638d7fb49ba61af28d682315786c3c39e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/Kconfig 1 file changed, 14 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/35597/4
Hello Werner Zeh, Paul Menzel, build bot (Jenkins), Nico Huber, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35597
to look at the new patch set (#5).
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
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 --- M src/Kconfig 1 file changed, 14 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/35597/5
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
Patch Set 5: Code-Review+2
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
Patch Set 5: Code-Review+2
Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35597 )
Change subject: Kconfig: Hide CONFIG_CBFS_SIZE when an FMDFILE is provided ......................................................................
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 --- M src/Kconfig 1 file changed, 14 insertions(+), 12 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Werner Zeh: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig index a1c016e..8fcb3ae 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -346,18 +346,6 @@ 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 @@ 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
-
Arthur Heymans (Code Review) -
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)
-
Werner Zeh (Code Review)