From 3a5b4224ac65638eff3ba0ed21c42abe7695f519 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 16 May 2022 13:13:22 -0600 Subject: [PATCH] coreboot: Drop custom TPM configs The `TPM_MEASURED_BOOT` configs have been enabled upstream so are not needed. TPM2 is working on gaze17, so drop the `TPM2` selection as well. Signed-off-by: Tim Crawford --- models/addw1/coreboot.config | 1 - models/addw2/coreboot.config | 1 - models/bonw14/coreboot.config | 1 - models/darp5/coreboot.config | 1 - models/darp6/coreboot.config | 1 - models/darp7/coreboot.config | 1 - models/galp2/coreboot.config | 1 - models/galp3-b/coreboot.config | 1 - models/galp3-c/coreboot.config | 1 - models/galp3/coreboot.config | 1 - models/galp4/coreboot.config | 1 - models/galp5/coreboot.config | 1 - models/gaze14_1650/coreboot.config | 1 - models/gaze14_1660ti/coreboot.config | 1 - models/gaze15/coreboot.config | 1 - models/gaze16-3050/coreboot.config | 1 - models/gaze16-3060-b/coreboot.config | 1 - models/gaze16-3060/coreboot.config | 1 - models/gaze17-3050/coreboot.config | 2 -- models/gaze17-3060-b/coreboot.config | 2 -- models/lemp10/coreboot.config | 1 - models/lemp9/coreboot.config | 1 - models/oryp5/coreboot.config | 1 - models/oryp6/coreboot.config | 1 - models/oryp7/coreboot.config | 1 - models/oryp8/coreboot.config | 1 - 26 files changed, 28 deletions(-) diff --git a/models/addw1/coreboot.config b/models/addw1/coreboot.config index 7cef0d3..eaa31d9 100644 --- a/models/addw1/coreboot.config +++ b/models/addw1/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/addw2/coreboot.config b/models/addw2/coreboot.config index f0d1439..cf3dce3 100644 --- a/models/addw2/coreboot.config +++ b/models/addw2/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/bonw14/coreboot.config b/models/bonw14/coreboot.config index 3585342..7ac0b48 100644 --- a/models/bonw14/coreboot.config +++ b/models/bonw14/coreboot.config @@ -15,7 +15,6 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x20000000 CONFIG_POST_IO=n CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config index a76ab01..68845f8 100644 --- a/models/darp5/coreboot.config +++ b/models/darp5/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config index a23ca37..cbc3015 100644 --- a/models/darp6/coreboot.config +++ b/models/darp6/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/darp7/coreboot.config b/models/darp7/coreboot.config index 316caf4..9df9eb1 100644 --- a/models/darp7/coreboot.config +++ b/models/darp7/coreboot.config @@ -16,7 +16,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/galp2/coreboot.config b/models/galp2/coreboot.config index 2cf3e64..8cac548 100644 --- a/models/galp2/coreboot.config +++ b/models/galp2/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_ME_CLEANER=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y diff --git a/models/galp3-b/coreboot.config b/models/galp3-b/coreboot.config index 84f7621..3e99d6d 100644 --- a/models/galp3-b/coreboot.config +++ b/models/galp3-b/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_ME_CLEANER=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config index 67f9589..a13e72c 100644 --- a/models/galp3-c/coreboot.config +++ b/models/galp3-c/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/galp3/coreboot.config b/models/galp3/coreboot.config index 4f42c44..2d2cd9f 100644 --- a/models/galp3/coreboot.config +++ b/models/galp3/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_ME_CLEANER=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config index 7fe4b43..cd0860e 100644 --- a/models/galp4/coreboot.config +++ b/models/galp4/coreboot.config @@ -15,7 +15,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/galp5/coreboot.config b/models/galp5/coreboot.config index 1753a65..77fee62 100644 --- a/models/galp5/coreboot.config +++ b/models/galp5/coreboot.config @@ -16,7 +16,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze14_1650/coreboot.config b/models/gaze14_1650/coreboot.config index 0253a4e..52a929c 100644 --- a/models/gaze14_1650/coreboot.config +++ b/models/gaze14_1650/coreboot.config @@ -12,7 +12,6 @@ CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)" CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze14_1660ti/coreboot.config b/models/gaze14_1660ti/coreboot.config index 0253a4e..52a929c 100644 --- a/models/gaze14_1660ti/coreboot.config +++ b/models/gaze14_1660ti/coreboot.config @@ -12,7 +12,6 @@ CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)" CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze15/coreboot.config b/models/gaze15/coreboot.config index 3f4d91a..8449ae9 100644 --- a/models/gaze15/coreboot.config +++ b/models/gaze15/coreboot.config @@ -13,7 +13,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze16-3050/coreboot.config b/models/gaze16-3050/coreboot.config index e2c5780..c94506e 100644 --- a/models/gaze16-3050/coreboot.config +++ b/models/gaze16-3050/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze16-3060-b/coreboot.config b/models/gaze16-3060-b/coreboot.config index 6a671a7..949bd8b 100644 --- a/models/gaze16-3060-b/coreboot.config +++ b/models/gaze16-3060-b/coreboot.config @@ -16,7 +16,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze16-3060/coreboot.config b/models/gaze16-3060/coreboot.config index 15cc542..c5a2d0b 100644 --- a/models/gaze16-3060/coreboot.config +++ b/models/gaze16-3060/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze17-3050/coreboot.config b/models/gaze17-3050/coreboot.config index be18f5c..b9c8a44 100644 --- a/models/gaze17-3050/coreboot.config +++ b/models/gaze17-3050/coreboot.config @@ -20,8 +20,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_TPM2=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/gaze17-3060-b/coreboot.config b/models/gaze17-3060-b/coreboot.config index 19e80b1..c8a0d43 100644 --- a/models/gaze17-3060-b/coreboot.config +++ b/models/gaze17-3060-b/coreboot.config @@ -22,8 +22,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y -CONFIG_TPM2=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/lemp10/coreboot.config b/models/lemp10/coreboot.config index 071f8ac..b3c8a91 100644 --- a/models/lemp10/coreboot.config +++ b/models/lemp10/coreboot.config @@ -16,7 +16,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/lemp9/coreboot.config b/models/lemp9/coreboot.config index 6af6c08..009dc8c 100644 --- a/models/lemp9/coreboot.config +++ b/models/lemp9/coreboot.config @@ -13,7 +13,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/oryp5/coreboot.config b/models/oryp5/coreboot.config index dc912e2..1b9184a 100644 --- a/models/oryp5/coreboot.config +++ b/models/oryp5/coreboot.config @@ -13,7 +13,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/oryp6/coreboot.config b/models/oryp6/coreboot.config index 36ec4b1..af371df 100644 --- a/models/oryp6/coreboot.config +++ b/models/oryp6/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/oryp7/coreboot.config b/models/oryp7/coreboot.config index 4f834ca..9fdf257 100644 --- a/models/oryp7/coreboot.config +++ b/models/oryp7/coreboot.config @@ -14,7 +14,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y diff --git a/models/oryp8/coreboot.config b/models/oryp8/coreboot.config index 459d5c4..0363eb8 100644 --- a/models/oryp8/coreboot.config +++ b/models/oryp8/coreboot.config @@ -17,7 +17,6 @@ CONFIG_POST_IO=n CONFIG_RUN_FSP_GOP=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_V2=y -CONFIG_TPM_MEASURED_BOOT=y CONFIG_USE_OPTION_TABLE=y CONFIG_VALIDATE_INTEL_DESCRIPTOR=y #CONFIG_CONSOLE_SYSTEM76_EC=y