[coreboot-gerrit] Change in ...coreboot[master]: mainboard/ocp/wedge100s: Add vboot support

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29593 )

Change subject: mainboard/ocp/wedge100s: Add vboot support
......................................................................

mainboard/ocp/wedge100s: Add vboot support

* Add RO only FMAP.
* Add kconfig options.

Tested=OCP Wedge100s

Change-Id: I1979e0263e41f21c01c407ac81ad1198a53741e8
Signed-off-by: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
Reviewed-on: https://review.coreboot.org/c/29593
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
---
M src/mainboard/ocp/wedge100s/Kconfig
M src/mainboard/ocp/wedge100s/cmos.layout
A src/mainboard/ocp/wedge100s/vboot-ro.fmd
3 files changed, 33 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philipp Deppenwiese: Looks good to me, approved



diff --git a/src/mainboard/ocp/wedge100s/Kconfig b/src/mainboard/ocp/wedge100s/Kconfig
index 5d4349d..df6c57e 100644
--- a/src/mainboard/ocp/wedge100s/Kconfig
+++ b/src/mainboard/ocp/wedge100s/Kconfig
@@ -16,6 +16,14 @@
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 
+config VBOOT
+	select VBOOT_VBNV_CMOS
+	select VBOOT_NO_BOARD_SUPPORT
+	select GBB_FLAG_DISABLE_LID_SHUTDOWN
+	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
+	select GBB_FLAG_DISABLE_FWMP
+
 config MAINBOARD_DIR
 	string
 	default "ocp/wedge100s"
@@ -30,6 +38,7 @@
 
 config CBFS_SIZE
 	hex
+	default 0x006fa000 if VBOOT
 	default 0x00200000
 
 config VIRTUAL_ROM_SIZE
@@ -45,6 +54,7 @@
 
 config FMDFILE
 	string
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-ro.fmd" if VBOOT
 	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
 
 endif # BOARD_OCP_WEDGE100S
diff --git a/src/mainboard/ocp/wedge100s/cmos.layout b/src/mainboard/ocp/wedge100s/cmos.layout
index 3c5bc3b..3aaa56b 100644
--- a/src/mainboard/ocp/wedge100s/cmos.layout
+++ b/src/mainboard/ocp/wedge100s/cmos.layout
@@ -81,6 +81,7 @@
 408          1       e       1        nmi
 409          2       e       7        power_on_after_fail
 #411          5       r       0        unused
+416          128      r      0        vbnv
 
 # MRC Scrambler Seed values
 896         32        r       0        mrc_scrambler_seed
diff --git a/src/mainboard/ocp/wedge100s/vboot-ro.fmd b/src/mainboard/ocp/wedge100s/vboot-ro.fmd
new file mode 100644
index 0000000..a591bae
--- /dev/null
+++ b/src/mainboard/ocp/wedge100s/vboot-ro.fmd
@@ -0,0 +1,22 @@
+FLASH 16M {
+	SI_ALL at 0x0 0x800000 {
+		SI_DESC at 0x0 0x1000
+		SI_ME at 0x1000 0x7ff000
+	}
+	SI_BIOS at 0x800000 0x800000 {
+		MISC_RW at 0x0 0x20000 {
+			RW_MRC_CACHE at 0x0 0x10000
+			RW_VPD at 0x010000 0x4000
+		}
+		WP_RO at 0x020000 0x7e0000 {
+			RO_VPD at 0x0 0x4000
+			RO_SECTION at 0x4000 0x7dc000 {
+				FMAP at 0x0 0x800
+				RO_FRID at 0x800 0x40
+				RO_FRID_PAD at 0x840 0x7c0
+				GBB at 0x1000 0xef000
+				COREBOOT(CBFS)@0xf0000 0x6ec000
+			}
+		}
+	}
+}

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29593
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I1979e0263e41f21c01c407ac81ad1198a53741e8
Gerrit-Change-Number: 29593
Gerrit-PatchSet: 9
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks at gmail.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph at 9elements.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181121/c96bd0e8/attachment.html>