From e999c90a16302b9a34efb86eb8085e15d327d0cd Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 22 Oct 2024 06:50:41 -0400 Subject: [PATCH] codebase: CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE -> CONFIG_FINALIZE_PLATFORM_LOCKING Signed-off-by: Thierry Laurion --- .../UNTESTED_t440p-maximized.config | 2 +- .../UNTESTED_w541-maximized/UNTESTED_w541-maximized.config | 2 +- boards/nitropad-nv41/nitropad-nv41.config | 2 +- .../optiplex-7010_9010-hotp-maximized.config | 2 +- .../optiplex-7010_9010-maximized.config | 2 +- .../optiplex-7010_9010_TXT-hotp-maximized.config | 2 +- .../optiplex-7010_9010_TXT-maximized.config | 2 +- boards/t420-hotp-maximized/t420-hotp-maximized.config | 2 +- boards/t420-maximized/t420-maximized.config | 2 +- boards/t430-hotp-maximized/t430-hotp-maximized.config | 2 +- boards/t430-maximized/t430-maximized.config | 2 +- boards/t530-hotp-maximized/t530-hotp-maximized.config | 2 +- boards/t530-maximized/t530-maximized.config | 2 +- boards/w530-hotp-maximized/w530-hotp-maximized.config | 2 +- boards/w530-maximized/w530-maximized.config | 2 +- boards/x220-hotp-maximized/x220-hotp-maximized.config | 2 +- boards/x220-maximized/x220-maximized.config | 2 +- .../x230-hotp-maximized-fhd_edp.config | 2 +- boards/x230-hotp-maximized/x230-hotp-maximized.config | 2 +- .../x230-hotp-maximized_usb-kb.config | 2 +- boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config | 2 +- boards/x230-maximized/x230-maximized.config | 2 +- boards/z220-cmt-maximized/z220-cmt-maximized.config | 2 +- initrd/bin/config-gui.sh | 6 +++--- initrd/bin/kexec-boot | 2 +- initrd/bin/lock_chip | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config b/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config index 260f320f..6ea92e2f 100644 --- a/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config +++ b/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config @@ -22,7 +22,7 @@ CONFIG_TPMTOTP=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y # Dependencies for a graphical menu. Enable CONFIG_SLANG and CONFIG_NEWT instead diff --git a/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config b/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config index 046a872a..5c7a27cd 100644 --- a/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config +++ b/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config @@ -22,7 +22,7 @@ CONFIG_TPMTOTP=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y # Dependencies for a graphical menu. Enable CONFIG_SLANG and CONFIG_NEWT instead diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index d1c7c609..6d9481dc 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -32,7 +32,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config b/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config index b034491b..e695df4f 100644 --- a/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config +++ b/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config @@ -49,7 +49,7 @@ CONFIG_HOTPKEY=y #platform locking finalization (PR0) # This prevents SPI from being writeable outside of Heads CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Nitrokey Storage admin tool (deprecated) #CONFIG_NKSTORECLI=n diff --git a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config index 1e0ed105..9d4e0e6f 100644 --- a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config +++ b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config @@ -49,7 +49,7 @@ CONFIG_TPMTOTP=y #platform locking finalization (PR0) # This prevents SPI from being writeable outside of Heads CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Nitrokey Storage admin tool (deprecated) #CONFIG_NKSTORECLI=n diff --git a/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config b/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config index ab0d8c42..35aa57d1 100644 --- a/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config +++ b/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config @@ -49,7 +49,7 @@ CONFIG_HOTPKEY=y #platform locking finalization (PR0) # This prevents SPI from being writeable outside of Heads CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Nitrokey Storage admin tool (deprecated) #CONFIG_NKSTORECLI=n diff --git a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config index eef49910..03a711e4 100644 --- a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config +++ b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config @@ -49,7 +49,7 @@ CONFIG_TPMTOTP=y #platform locking finalization (PR0) # This prevents SPI from being writeable outside of Heads CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Nitrokey Storage admin tool (deprecated) #CONFIG_NKSTORECLI=n diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config index 9975550f..4ab33a43 100644 --- a/boards/t420-hotp-maximized/t420-hotp-maximized.config +++ b/boards/t420-hotp-maximized/t420-hotp-maximized.config @@ -32,7 +32,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support #TPM based requirements diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config index 39475d88..1293dd2d 100644 --- a/boards/t420-maximized/t420-maximized.config +++ b/boards/t420-maximized/t420-maximized.config @@ -31,7 +31,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support #TPM based requirements diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config index d9961116..4b64ffef 100644 --- a/boards/t430-hotp-maximized/t430-hotp-maximized.config +++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config @@ -30,7 +30,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support #TPM based requirements diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config index 188048bf..4164db3d 100644 --- a/boards/t430-maximized/t430-maximized.config +++ b/boards/t430-maximized/t430-maximized.config @@ -30,7 +30,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/t530-hotp-maximized/t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config index 213547f9..bdd005ae 100644 --- a/boards/t530-hotp-maximized/t530-hotp-maximized.config +++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config @@ -31,7 +31,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/t530-maximized/t530-maximized.config b/boards/t530-maximized/t530-maximized.config index 4449e2d8..b291fa94 100644 --- a/boards/t530-maximized/t530-maximized.config +++ b/boards/t530-maximized/t530-maximized.config @@ -31,7 +31,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/w530-hotp-maximized/w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config index 7d7a1826..ddb91dba 100644 --- a/boards/w530-hotp-maximized/w530-hotp-maximized.config +++ b/boards/w530-hotp-maximized/w530-hotp-maximized.config @@ -31,7 +31,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/w530-maximized/w530-maximized.config b/boards/w530-maximized/w530-maximized.config index e9bb59df..bb691ad7 100644 --- a/boards/w530-maximized/w530-maximized.config +++ b/boards/w530-maximized/w530-maximized.config @@ -31,7 +31,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config index 1a777086..b8dc88e4 100644 --- a/boards/x220-hotp-maximized/x220-hotp-maximized.config +++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config @@ -32,7 +32,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support #TPM based requirements diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config index 55265785..2bd094ec 100644 --- a/boards/x220-maximized/x220-maximized.config +++ b/boards/x220-maximized/x220-maximized.config @@ -32,7 +32,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support #TPM based requirements diff --git a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config index 1bb65c31..0e8c8420 100644 --- a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config +++ b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config @@ -43,7 +43,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index f4e85983..cdd0c867 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -49,7 +49,7 @@ CONFIG_HOTPKEY=y #platform locking finalization (PR0) # This prevents SPI from being writeable outside of Heads CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Nitrokey Storage admin tool (deprecated) #CONFIG_NKSTORECLI=n diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config index a6dd8727..8508baa8 100644 --- a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config +++ b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config @@ -39,7 +39,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config index feda20a9..7ca11057 100644 --- a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config +++ b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config @@ -43,7 +43,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config index 7b5b4a01..78cc6492 100644 --- a/boards/x230-maximized/x230-maximized.config +++ b/boards/x230-maximized/x230-maximized.config @@ -34,7 +34,7 @@ CONFIG_PCIUTILS=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y #Remote attestation support diff --git a/boards/z220-cmt-maximized/z220-cmt-maximized.config b/boards/z220-cmt-maximized/z220-cmt-maximized.config index 41cb9927..c254331d 100644 --- a/boards/z220-cmt-maximized/z220-cmt-maximized.config +++ b/boards/z220-cmt-maximized/z220-cmt-maximized.config @@ -43,7 +43,7 @@ CONFIG_TPMTOTP=y #platform locking finalization (PR0) CONFIG_IO386=y -export CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE=y +export CONFIG_FINALIZE_PLATFORM_LOCKING=y # Dependencies for a graphical menu. Enable CONFIG_SLANG and CONFIG_NEWT instead # for a console-based menu. diff --git a/initrd/bin/config-gui.sh b/initrd/bin/config-gui.sh index 7f8142e6..1ee1d381 100755 --- a/initrd/bin/config-gui.sh +++ b/initrd/bin/config-gui.sh @@ -85,7 +85,7 @@ while true; do 'Z' " $(get_config_display_action "$CONFIG_DEBUG_OUTPUT") $CONFIG_BRAND_NAME debug and function tracing output" ) - [ "$CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE" = "y" ] && dynamic_config_options+=( + [ "$CONFIG_FINALIZE_PLATFORM_LOCKING" = "y" ] && dynamic_config_options+=( 't' ' Deactivate Platform Locking to permit OS write access to firmware' ) @@ -105,8 +105,8 @@ while true; do case "$menu_choice" in "t" ) - unset CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE - replace_config /etc/config.user "CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE" "n" + unset CONFIG_FINALIZE_PLATFORM_LOCKING + replace_config /etc/config.user "CONFIG_FINALIZE_PLATFORM_LOCKING" "n" combine_configs . /tmp/config ;; diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot index 14478879..fa37ebf9 100755 --- a/initrd/bin/kexec-boot +++ b/initrd/bin/kexec-boot @@ -170,7 +170,7 @@ if [ "$CONFIG_TPM" = "y" ]; then tpmr kexec_finalize fi -if [ -x /bin/io386 -a "$CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE" = "y" ]; then +if [ -x /bin/io386 -a "$CONFIG_FINALIZE_PLATFORM_LOCKING" = "y" ]; then lock_chip fi diff --git a/initrd/bin/lock_chip b/initrd/bin/lock_chip index d9d4fbfa..6085b84e 100755 --- a/initrd/bin/lock_chip +++ b/initrd/bin/lock_chip @@ -9,7 +9,7 @@ . /etc/ash_functions TRACE "Under /bin/lock_chip" -if [ "$CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE" = "y" ]; then +if [ "$CONFIG_FINALIZE_PLATFORM_LOCKING" = "y" ]; then APM_CNT=0xb2 FIN_CODE=0xcb fi