Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35552 )
Change subject: mb/siemens/mc_apl{2,4,5}: Enable VBOOT ......................................................................
mb/siemens/mc_apl{2,4,5}: Enable VBOOT
Enable VBOOT in Kconfig and provide a flashmap that includes all the needed sections for VBOOT support.
Change-Id: I3d58094256d2730dbd249291a8f1ed8df9dfe62d Signed-off-by: Werner Zeh werner.zeh@siemens.com --- A src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd M src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig 4 files changed, 76 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/35552/1
diff --git a/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd new file mode 100644 index 0000000..d1cbfcf --- /dev/null +++ b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd @@ -0,0 +1,30 @@ +FLASH 16M { + WP_RO@0x0 0xe93000 { + SI_DESC@0x0 0x1000 + IFWI@0x1000 0x2ff000 + RO_VPD@0x300000 0x4000 + RO_SECTION@0x304000 0xb8f000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + COREBOOT(CBFS)@0x1000 0xb4e000 + GBB@0xb4f000 0x40000 + } + } + MISC_RW@0xe93000 0x2c000 { + UNIFIED_MRC_CACHE@0x0 0x21000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + RW_VAR_MRC_CACHE@0x20000 0x1000 + } + RW_SHARED@0x21000 0x4000 { + SHARED_DATA@0x0 0x2000 + VBLOCK_DEV@0x2000 0x2000 + } + RW_VPD@0x25000 0x2000 + RW_NVRAM@0x27000 0x5000 + } + BIOS_UNUSABLE@0xebf000 0x40000 + DEVICE_EXTENSION@0xeff000 0x100000 + UNUSED_HOLE@0xfff000 0x1000 +} diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig index 4e4a928..10b4429 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig @@ -10,4 +10,19 @@ select MAINBOARD_HAS_LPC_TPM select TPM_ON_FAST_SPI
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL2 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index 1ee72bb..31317b9 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -12,4 +12,20 @@ config UART_FOR_CONSOLE default 1
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + select VBOOT_VBNV_FLASH + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL4 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig index 4a4b6cc..c090590 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig @@ -12,4 +12,19 @@ select MAINBOARD_HAS_LPC_TPM select TPM_ON_FAST_SPI
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL5
Hello Mario Scheithauer, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35552
to look at the new patch set (#2).
Change subject: mb/siemens/mc_apl{2,4,5}: Enable VBOOT ......................................................................
mb/siemens/mc_apl{2,4,5}: Enable VBOOT
Enable VBOOT in Kconfig and provide a flashmap that includes all the needed sections for VBOOT support.
Change-Id: I3d58094256d2730dbd249291a8f1ed8df9dfe62d Signed-off-by: Werner Zeh werner.zeh@siemens.com --- A src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd M src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig 4 files changed, 78 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/35552/2
Mario Scheithauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35552 )
Change subject: mb/siemens/mc_apl{2,4,5}: Enable VBOOT ......................................................................
Patch Set 2: Code-Review+2
I tested this patch on mc_apl5 and found no differences into console log to the previous version. So it looks good to me.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35552 )
Change subject: mb/siemens/mc_apl{2,4,5}: Enable VBOOT ......................................................................
Patch Set 2: Code-Review+1
Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35552 )
Change subject: mb/siemens/mc_apl{2,4,5}: Enable VBOOT ......................................................................
mb/siemens/mc_apl{2,4,5}: Enable VBOOT
Enable VBOOT in Kconfig and provide a flashmap that includes all the needed sections for VBOOT support.
Change-Id: I3d58094256d2730dbd249291a8f1ed8df9dfe62d Signed-off-by: Werner Zeh werner.zeh@siemens.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35552 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Mario Scheithauer mario.scheithauer@siemens.com Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- A src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd M src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig 4 files changed, 78 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Mario Scheithauer: Looks good to me, approved
diff --git a/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd new file mode 100644 index 0000000..d1cbfcf --- /dev/null +++ b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd @@ -0,0 +1,30 @@ +FLASH 16M { + WP_RO@0x0 0xe93000 { + SI_DESC@0x0 0x1000 + IFWI@0x1000 0x2ff000 + RO_VPD@0x300000 0x4000 + RO_SECTION@0x304000 0xb8f000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + COREBOOT(CBFS)@0x1000 0xb4e000 + GBB@0xb4f000 0x40000 + } + } + MISC_RW@0xe93000 0x2c000 { + UNIFIED_MRC_CACHE@0x0 0x21000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + RW_VAR_MRC_CACHE@0x20000 0x1000 + } + RW_SHARED@0x21000 0x4000 { + SHARED_DATA@0x0 0x2000 + VBLOCK_DEV@0x2000 0x2000 + } + RW_VPD@0x25000 0x2000 + RW_NVRAM@0x27000 0x5000 + } + BIOS_UNUSABLE@0xebf000 0x40000 + DEVICE_EXTENSION@0xeff000 0x100000 + UNUSED_HOLE@0xfff000 0x1000 +} diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig index 4e4a928..6adf4e9 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig @@ -10,4 +10,20 @@ select MAINBOARD_HAS_LPC_TPM select TPM_ON_FAST_SPI
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + select VBOOT_VBNV_FLASH + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL2 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index 1ee72bb..31317b9 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -12,4 +12,20 @@ config UART_FOR_CONSOLE default 1
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + select VBOOT_VBNV_FLASH + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL4 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig index 4a4b6cc..21d7ac7 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig @@ -12,4 +12,20 @@ select MAINBOARD_HAS_LPC_TPM select TPM_ON_FAST_SPI
+config CBFS_SIZE + default 0xb4e000 + +config VBOOT + select VBOOT_MEASURED_BOOT + select VBOOT_VBNV_FLASH + 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 FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + endif # BOARD_SIEMENS_MC_APL5
-
Mario Scheithauer (Code Review) -
Paul Menzel (Code Review)
-
Werner Zeh (Code Review)