<p>Alexander Couzens has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21237">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Kconfig: move remaining Mainboard options into src/mainboard/Kconfig.mainboard<br><br>Change-Id: I909d090ea449dbf0ef0328b7c2741214bc8a07d4<br>Signed-off-by: Alexander Couzens <lynxis@fe80.eu><br>---<br>M src/Kconfig<br>M src/mainboard/Kconfig.mainboard<br>2 files changed, 40 insertions(+), 40 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/21237/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/Kconfig b/src/Kconfig<br>index 637f575..4dd1ded 100644<br>--- a/src/Kconfig<br>+++ b/src/Kconfig<br>@@ -273,46 +273,6 @@<br> <br> source "src/mainboard/Kconfig"<br> <br>-config DEVICETREE<br>- string<br>- default "devicetree.cb"<br>- help<br>- This symbol allows mainboards to select a different file under their<br>- mainboard directory for the devicetree.cb file. This allows the board<br>- variants that need different devicetrees to be in the same directory.<br>-<br>- Examples: "devicetree.variant.cb"<br>- "variant/devicetree.cb"<br>-<br>-config CBFS_SIZE<br>- hex "Size of CBFS filesystem in ROM"<br>- # Default value set at the end of the file<br>- help<br>- This is the part of the ROM actually managed by CBFS, located at the<br>- end of the ROM (passed through cbfstool -o) on x86 and at at the start<br>- of the ROM (passed through cbfstool -s) everywhere else. It defaults<br>- to span the whole ROM on all but Intel systems that use an Intel Firmware<br>- Descriptor. It can be overridden to make coreboot live alongside other<br>- components like ChromeOS's vboot/FMAP or Intel's IFD / ME / TXE<br>- binaries.<br>-<br>-config FMDFILE<br>- string "fmap description file in fmd format"<br>- default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS<br>- default ""<br>- help<br>- The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,<br>- but in some cases more complex setups are required.<br>- When an fmd is specified, it overrides the default format.<br>-<br>-config MAINBOARD_HAS_TPM2<br>- bool<br>- default n<br>- help<br>- There is a TPM device installed on the mainboard, and it is<br>- compliant with version 2 TCG TPM specification. Could be connected<br>- over LPC, SPI or I2C.<br>-<br> endmenu<br> <br> # load site-local kconfig to allow user specific defaults and overrides<br>diff --git a/src/mainboard/Kconfig.mainboard b/src/mainboard/Kconfig.mainboard<br>index babbb95..8983b8a 100644<br>--- a/src/mainboard/Kconfig.mainboard<br>+++ b/src/mainboard/Kconfig.mainboard<br>@@ -155,3 +155,43 @@<br> config ENABLE_POWER_BUTTON<br> def_bool y if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_ENABLE<br> def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE<br>+<br>+config DEVICETREE<br>+ string<br>+ default "devicetree.cb"<br>+ help<br>+ This symbol allows mainboards to select a different file under their<br>+ mainboard directory for the devicetree.cb file. This allows the board<br>+ variants that need different devicetrees to be in the same directory.<br>+<br>+ Examples: "devicetree.variant.cb"<br>+ "variant/devicetree.cb"<br>+<br>+config CBFS_SIZE<br>+ hex "Size of CBFS filesystem in ROM"<br>+ # Default value set at the end of the file<br>+ help<br>+ This is the part of the ROM actually managed by CBFS, located at the<br>+ end of the ROM (passed through cbfstool -o) on x86 and at at the start<br>+ of the ROM (passed through cbfstool -s) everywhere else. It defaults<br>+ to span the whole ROM on all but Intel systems that use an Intel Firmware<br>+ Descriptor. It can be overridden to make coreboot live alongside other<br>+ components like ChromeOS's vboot/FMAP or Intel's IFD / ME / TXE<br>+ binaries.<br>+<br>+config FMDFILE<br>+ string "fmap description file in fmd format"<br>+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if CHROMEOS<br>+ default ""<br>+ help<br>+ The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE,<br>+ but in some cases more complex setups are required.<br>+ When an fmd is specified, it overrides the default format.<br>+<br>+config MAINBOARD_HAS_TPM2<br>+ bool<br>+ default n<br>+ help<br>+ There is a TPM device installed on the mainboard, and it is<br>+ compliant with version 2 TCG TPM specification. Could be connected<br>+ over LPC, SPI or I2C.<br></pre><p>To view, visit <a href="https://review.coreboot.org/21237">change 21237</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21237"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I909d090ea449dbf0ef0328b7c2741214bc8a07d4 </div>
<div style="display:none"> Gerrit-Change-Number: 21237 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Couzens <lynxis@fe80.eu> </div>