David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
mb/facebook/watson: Enable vboot for measurements
Signed-off-by: Philipp Deppenwiese philipp.deppenwiese@9elements.com Change-Id: I8287d475301aaaae736df9cc95fcd18cc04b40fb --- M src/mainboard/facebook/watson/Kconfig M src/mainboard/facebook/watson/cmos.layout A src/mainboard/facebook/watson/vboot-ro.fmd 3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/35232/1
diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig index 43b4784..3235b6c 100644 --- a/src/mainboard/facebook/watson/Kconfig +++ b/src/mainboard/facebook/watson/Kconfig @@ -13,6 +13,14 @@ select MAINBOARD_HAS_TPM1 select NO_UART_ON_SUPERIO
+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 "facebook/watson" diff --git a/src/mainboard/facebook/watson/cmos.layout b/src/mainboard/facebook/watson/cmos.layout index 85506eb..675370d 100644 --- a/src/mainboard/facebook/watson/cmos.layout +++ b/src/mainboard/facebook/watson/cmos.layout @@ -72,6 +72,7 @@ #392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused +416 128 r 0 vbnv
# coreboot config options: check sums 984 16 h 0 check_sum diff --git a/src/mainboard/facebook/watson/vboot-ro.fmd b/src/mainboard/facebook/watson/vboot-ro.fmd new file mode 100644 index 0000000..bcb075a --- /dev/null +++ b/src/mainboard/facebook/watson/vboot-ro.fmd @@ -0,0 +1,26 @@ +FLASH 16M { + SI_ALL@0x0 0x600000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x1000 + IDPROM@0x2000 0x400 + UNUSED_2@0x2400 0x1ec00 + SI_ME@0x21000 0x3de000 + UNUSED_3@0x400000 0x200000 + } + SI_BIOS@0x600000 0xA00000 { + MISC_RW@0x0 0x20000 { + RW_MRC_CACHE@0x0 0x10000 + RW_VPD(PRESERVE)@0x010000 0x4000 + } + WP_RO@0x20000 0x9e0000 { + RO_VPD(PRESERVE)@0x0 0x4000 + RO_SECTION@0x4000 0x9dc000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0xef000 + COREBOOT(CBFS)@0xf0000 0x8ec000 + } + } + } +}
Philipp Deppenwiese has uploaded a new patch set (#2) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
mb/facebook/watson: Enable vboot for measurements
Signed-off-by: Philipp Deppenwiese philipp.deppenwiese@9elements.com Change-Id: I8287d475301aaaae736df9cc95fcd18cc04b40fb --- M src/mainboard/facebook/watson/Kconfig M src/mainboard/facebook/watson/cmos.layout A src/mainboard/facebook/watson/vboot-ro.fmd 3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/35232/2
David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
Patch Set 2:
This change is ready for review.
David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
Patch Set 2:
This change is ready for review.
Philipp Deppenwiese has uploaded a new patch set (#3) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
mb/facebook/watson: Enable vboot for measurements
Signed-off-by: Philipp Deppenwiese philipp.deppenwiese@9elements.com Change-Id: I8287d475301aaaae736df9cc95fcd18cc04b40fb --- M src/mainboard/facebook/watson/Kconfig M src/mainboard/facebook/watson/cmos.layout A src/mainboard/facebook/watson/vboot-ro.fmd 3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/35232/3
Andrey Petrov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35232 )
Change subject: mb/facebook/watson: Enable vboot for measurements ......................................................................
mb/facebook/watson: Enable vboot for measurements
Signed-off-by: Philipp Deppenwiese philipp.deppenwiese@9elements.com Change-Id: I8287d475301aaaae736df9cc95fcd18cc04b40fb Reviewed-on: https://review.coreboot.org/c/coreboot/+/35232 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Andrey Petrov anpetrov@fb.com --- M src/mainboard/facebook/watson/Kconfig M src/mainboard/facebook/watson/cmos.layout A src/mainboard/facebook/watson/vboot-ro.fmd 3 files changed, 35 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Andrey Petrov: Looks good to me, approved
diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig index 43b4784..3235b6c 100644 --- a/src/mainboard/facebook/watson/Kconfig +++ b/src/mainboard/facebook/watson/Kconfig @@ -13,6 +13,14 @@ select MAINBOARD_HAS_TPM1 select NO_UART_ON_SUPERIO
+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 "facebook/watson" diff --git a/src/mainboard/facebook/watson/cmos.layout b/src/mainboard/facebook/watson/cmos.layout index 85506eb..675370d 100644 --- a/src/mainboard/facebook/watson/cmos.layout +++ b/src/mainboard/facebook/watson/cmos.layout @@ -72,6 +72,7 @@ #392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused +416 128 r 0 vbnv
# coreboot config options: check sums 984 16 h 0 check_sum diff --git a/src/mainboard/facebook/watson/vboot-ro.fmd b/src/mainboard/facebook/watson/vboot-ro.fmd new file mode 100644 index 0000000..cc6a7c5 --- /dev/null +++ b/src/mainboard/facebook/watson/vboot-ro.fmd @@ -0,0 +1,26 @@ +FLASH 16M { + SI_ALL@0x0 0x600000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x1000 + IDPROM@0x2000 0x400 + UNUSED_2@0x2400 0x1ec00 + SI_ME@0x21000 0x3de000 + UNUSED_3@0x400000 0x200000 + } + SI_BIOS@0x600000 0xA00000 { + MISC_RW@0x0 0x20000 { + RW_MRC_CACHE@0x0 0x10000 + RW_VPD(PRESERVE)@0x010000 0x4000 + } + WP_RO@0x20000 0x9e0000 { + RO_VPD(PRESERVE)@0x0 0x4000 + RO_SECTION@0x4000 0x9dc000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x9d7000 + } + } + } +}
-
Andrey Petrov (Code Review) -
David Hendricks (Code Review)
-
Patrick Georgi (Code Review)
-
Philipp Deppenwiese (Code Review)