Skip to content

Commit 6b61f61

Browse files
committed
boards aimed to bump at coreboot 4.22.01: switch TPM event log format to TCG
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 4bb8317 commit 6b61f61

19 files changed

Lines changed: 38 additions & 38 deletions

config/coreboot-p8z77-m_pro-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,8 @@ CONFIG_TPM=y
519519
# CONFIG_TPM_DEACTIVATE is not set
520520
# CONFIG_DEBUG_TPM is not set
521521
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
522-
CONFIG_TPM_LOG_CB=y
523-
# CONFIG_TPM_LOG_TPM1 is not set
522+
# CONFIG_TPM_LOG_CB is not set
523+
CONFIG_TPM_LOG_TPM1=y
524524
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
525525
CONFIG_PCR_BOOT_MODE=1
526526
CONFIG_PCR_HWID=1

config/coreboot-qemu-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ CONFIG_TPM=y
415415
# CONFIG_TPM_DEACTIVATE is not set
416416
# CONFIG_DEBUG_TPM is not set
417417
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
418-
CONFIG_TPM_LOG_CB=y
419-
# CONFIG_TPM_LOG_TPM1 is not set
418+
# CONFIG_TPM_LOG_CB is not set
419+
CONFIG_TPM_LOG_TPM1=y
420420
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
421421
CONFIG_PCR_BOOT_MODE=1
422422
CONFIG_PCR_HWID=1

config/coreboot-t420-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
537537
# CONFIG_TPM_DEACTIVATE is not set
538538
# CONFIG_DEBUG_TPM is not set
539539
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
540-
CONFIG_TPM_LOG_CB=y
541-
# CONFIG_TPM_LOG_TPM1 is not set
540+
# CONFIG_TPM_LOG_CB is not set
541+
CONFIG_TPM_LOG_TPM1=y
542542
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
543543
CONFIG_PCR_BOOT_MODE=1
544544
CONFIG_PCR_HWID=1

config/coreboot-t420.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
536536
# CONFIG_TPM_DEACTIVATE is not set
537537
# CONFIG_DEBUG_TPM is not set
538538
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
539-
CONFIG_TPM_LOG_CB=y
540-
# CONFIG_TPM_LOG_TPM1 is not set
539+
# CONFIG_TPM_LOG_CB is not set
540+
CONFIG_TPM_LOG_TPM1=y
541541
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
542542
CONFIG_PCR_BOOT_MODE=1
543543
CONFIG_PCR_HWID=1

config/coreboot-t430-legacy.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
524524
# CONFIG_TPM_DEACTIVATE is not set
525525
# CONFIG_DEBUG_TPM is not set
526526
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
527-
CONFIG_TPM_LOG_CB=y
528-
# CONFIG_TPM_LOG_TPM1 is not set
527+
# CONFIG_TPM_LOG_CB is not set
528+
CONFIG_TPM_LOG_TPM1=y
529529
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
530530
CONFIG_PCR_BOOT_MODE=1
531531
CONFIG_PCR_HWID=1

config/coreboot-t430-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
537537
# CONFIG_TPM_DEACTIVATE is not set
538538
# CONFIG_DEBUG_TPM is not set
539539
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
540-
CONFIG_TPM_LOG_CB=y
541-
# CONFIG_TPM_LOG_TPM1 is not set
540+
# CONFIG_TPM_LOG_CB is not set
541+
CONFIG_TPM_LOG_TPM1=y
542542
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
543543
CONFIG_PCR_BOOT_MODE=1
544544
CONFIG_PCR_HWID=1

config/coreboot-t440p.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
530530
# CONFIG_TPM_DEACTIVATE is not set
531531
# CONFIG_DEBUG_TPM is not set
532532
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
533-
CONFIG_TPM_LOG_CB=y
534-
# CONFIG_TPM_LOG_TPM1 is not set
533+
# CONFIG_TPM_LOG_CB is not set
534+
CONFIG_TPM_LOG_TPM1=y
535535
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
536536
CONFIG_PCR_BOOT_MODE=1
537537
CONFIG_PCR_HWID=1

config/coreboot-t530-dgpu-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
572572
# CONFIG_TPM_DEACTIVATE is not set
573573
# CONFIG_DEBUG_TPM is not set
574574
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
575-
CONFIG_TPM_LOG_CB=y
576-
# CONFIG_TPM_LOG_TPM1 is not set
575+
# CONFIG_TPM_LOG_CB is not set
576+
CONFIG_TPM_LOG_TPM1=y
577577
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
578578
CONFIG_PCR_BOOT_MODE=1
579579
CONFIG_PCR_HWID=1

config/coreboot-t530-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
539539
# CONFIG_TPM_DEACTIVATE is not set
540540
# CONFIG_DEBUG_TPM is not set
541541
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
542-
CONFIG_TPM_LOG_CB=y
543-
# CONFIG_TPM_LOG_TPM1 is not set
542+
# CONFIG_TPM_LOG_CB is not set
543+
CONFIG_TPM_LOG_TPM1=y
544544
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
545545
CONFIG_PCR_BOOT_MODE=1
546546
CONFIG_PCR_HWID=1

config/coreboot-w530-dgpu-K1000m-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
573573
# CONFIG_TPM_DEACTIVATE is not set
574574
# CONFIG_DEBUG_TPM is not set
575575
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
576-
CONFIG_TPM_LOG_CB=y
577-
# CONFIG_TPM_LOG_TPM1 is not set
576+
# CONFIG_TPM_LOG_CB is not set
577+
CONFIG_TPM_LOG_TPM1=y
578578
CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
579579
CONFIG_PCR_BOOT_MODE=1
580580
CONFIG_PCR_HWID=1

0 commit comments

Comments
 (0)