codebase: CONFIG_FINALIZE_PLATFORM_LOCKING_PRESKYLAKE -> CONFIG_FINALIZE_PLATFORM_LOCKING

tlaurion · tlaurion · commit b14d32ee1ea8 · 2024-10-22T07:39:06.000-04:00
Signed-off-by: Thierry Laurion &lt;insurgo@riseup.net&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/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/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
@@ -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
@@ -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
@@ -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/w541-maximized/w541-maximized.config b/boards/w541-maximized/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
