HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45136 )
Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ......................................................................
src/Kconfig: Move mainboards specific symbols to mb/Kconfig
Now, symbols are visible in kconfig tools defined in mb/Kconfig instead of odd.
Change-Id: If09dd487e940e18b11ac12e1c14f725b22b5bf70 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/Kconfig M src/mainboard/Kconfig 2 files changed, 45 insertions(+), 45 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/45136/1
diff --git a/src/Kconfig b/src/Kconfig index d6b703b..b9b2992 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -441,51 +441,6 @@
source "src/mainboard/Kconfig"
-config DEVICETREE - string - default "devicetree.cb" - help - This symbol allows mainboards to select a different file under their - mainboard directory for the devicetree.cb file. This allows the board - variants that need different devicetrees to be in the same directory. - - Examples: "devicetree.variant.cb" - "variant/devicetree.cb" - -config OVERRIDE_DEVICETREE - string - default "" - help - This symbol allows variants to provide an override devicetree file to - override the registers and/or add new devices on top of the ones - provided by baseboard devicetree using CONFIG_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 - 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 diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index be53982..eb45858 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -14,8 +14,53 @@ config MAINBOARD_FAMILY string
+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 + 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. + source "src/mainboard/*/Kconfig"
+config DEVICETREE + string + default "devicetree.cb" + help + This symbol allows mainboards to select a different file under their + mainboard directory for the devicetree.cb file. This allows the board + variants that need different devicetrees to be in the same directory. + + Examples: "devicetree.variant.cb" + "variant/devicetree.cb" + +config OVERRIDE_DEVICETREE + string + default "" + help + This symbol allows variants to provide an override devicetree file to + override the registers and/or add new devices on top of the ones + provided by baseboard devicetree using CONFIG_DEVICETREE. + + Examples: "devicetree.variant-override.cb" + "variant/devicetree-override.cb" + config BOARD_ROMSIZE_KB_64 bool config BOARD_ROMSIZE_KB_128
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45136
to look at the new patch set (#2).
Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ......................................................................
src/Kconfig: Move mainboards specific symbols to mb/Kconfig
Now, symbols are visible in kconfig tools defined in mb/Kconfig instead of an odd place.
Change-Id: If09dd487e940e18b11ac12e1c14f725b22b5bf70 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/Kconfig M src/mainboard/Kconfig 2 files changed, 45 insertions(+), 45 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/45136/2
Hello build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45136
to look at the new patch set (#4).
Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ......................................................................
src/Kconfig: Move mainboards specific symbols to mb/Kconfig
Now, symbols are visible in kconfig tools defined in mb/Kconfig instead of an odd place.
Change-Id: If09dd487e940e18b11ac12e1c14f725b22b5bf70 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/Kconfig M src/mainboard/Kconfig 2 files changed, 45 insertions(+), 45 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/45136/4
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45136 )
Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45136/4/src/mainboard/Kconfig File src/mainboard/Kconfig:
https://review.coreboot.org/c/coreboot/+/45136/4/src/mainboard/Kconfig@55 PS4, Line 55: 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. now on Kconfig tool (menuconfig) we have:
Search (FMDFILE) ──────────────────────────────────────────────────────────────────────────────
┌────────────────────────────────────── Search Results ──────────────────────────────────────┐ │ Symbol: FMDFILE [=] │ │ Type : string │ │ Prompt: FMAP description file in fmd format │ │ Location: │ │ (1) -> Mainboard │ │ Prompt: fmap description file in fmd format │ │ Location: │ │ (2) -> Mainboard │ │ Defined at src/mainboard/51nb/x210/Kconfig:47 │ │ Depends on: VENDOR_51NB [=n] && BOARD_51NB_X210 [=n]
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/45136 )
Change subject: src/Kconfig: Move mainboards specific symbols to mb/Kconfig ......................................................................
Abandoned
Merge Conflict
-
HAOUAS Elyes (Code Review)