summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWerner Zeh <werner.zeh@siemens.com>2019-09-23 15:52:02 +0200
committerWerner Zeh <werner.zeh@siemens.com>2019-09-25 08:14:46 +0000
commit255748ea5dc48878ed1986afeb1766cc49360465 (patch)
tree32435a7ea14c7c1934d61b28f12189324fb53425 /src
parentf35eee94bd810c9403b9fe65a8341a2eb8c8a722 (diff)
downloadcoreboot-255748ea5dc48878ed1986afeb1766cc49360465.tar.xz
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>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd30
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig16
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig16
-rw-r--r--src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig16
4 files changed, 78 insertions, 0 deletions
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 0000000000..d1cbfcf7f7
--- /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 4e4a9281bd..6adf4e9c41 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 @@ config BOARD_SPECIFIC_OPTIONS
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 1ee72bb8d5..31317b9280 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 BOARD_SPECIFIC_OPTIONS
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 4a4b6cc604..21d7ac7b78 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 @@ config BOARD_SPECIFIC_OPTIONS
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