.circleci/config.yml + blobs/xx80/t480(s)_download_clean_deguard_me_pad_tb.sh : unify and fix t480s from t480 25.09 coreboot version bump

Also fix paths in board configs to targets that were renamed to be different for t480/t480s
(This is why we hate bitroting PR)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Author: tlaurion

.circleci/config.yml

@@ -528,23 +528,20 @@ workflows:
           requires:
             - librem_14
 
-      # t480 is based on 25.09 coreboot release, not sharing any buildstack from now, depend on muscl-cross cache
-      - build:
+      # t480 is based on 25.09 coreboot release
           name: EOL_t480-maximized
           target: EOL_t480-maximized
           subcommand: ""
           requires:
             - EOL_t480-hotp-maximized
 
-      # t480s is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muslc-cross cache
       - build:
           name: EOL_t480s-hotp-maximized
           target: EOL_t480s-hotp-maximized
           subcommand: ""
           requires:
             - EOL_t480-hotp-maximized
 
-      # t480s is based on 24.12 coreboot release, not sharing any buildstack from now, depend on muslc-cross cache
       - build:
           name: EOL_t480s-maximized
           target: EOL_t480s-maximized
@@ -560,7 +557,7 @@ workflows:
           requires:
             - novacustom-nv4x_adl
 
-      #NovaCustom v56 boards are based on coreboot 24.02.01 fork, so depend on x230
+      #NovaCustom v56 boards are based on coreboot 24.02.01 fork, so depend on nv4x_adl
       - build:
           name: novacustom-v560tu
           target: novacustom-v560tu

blobs/xx80/t480_download_clean_deguard_me_pad_tb.sh

@@ -82,6 +82,7 @@ function download_and_clean() {
 	# Some more general info on shrinking:
 	# https://github.com/corna/me_cleaner/wiki/External-flashing#neutralize-and-shrink-intel-me-useful-only-for-coreboot
 
+	# MFS is needed for deguard so we whitelist it here and also do not relocate the FTPR partition
 	python "$me_cleaner" --whitelist MFS -t -O "$me_output" "${me_installer_filename}_extracted/Firmware/${extracted_me_filename}"
 	rm -rf ./*
 	popd || exit

blobs/xx80/t480s_download_clean_deguard_me_pad_tb.sh

@@ -72,11 +72,15 @@ function download_and_clean() {
 
 	extracted_me_filename="1 Inspiron_5468_1.3.0 -- 3 Intel Management Engine (Non-VPro) Update v${ME_version}.bin"
 
-	# Neutralize and shrink Intel ME. Note that this doesn't include
+	# Deactivate, partially neuter and shrink Intel ME. Note that this doesn't include
 	# --soft-disable to set the "ME Disable" or "ME Disable B" (e.g.,
 	# High Assurance Program) bits, as they are defined within the Flash
 	# Descriptor.
 	# However, the HAP bit must be enabled to make the deguarded ME work. We only clean the ME in this function.
+	# For ME 11.x this means we must keep the rbe, bup, kernel and syslib modules.
+	# https://github.com/corna/me_cleaner/wiki/How-does-it-work%3F#me-versions-from-11x-skylake-1
+	# Furthermore, deguard requires keeping the MFS, the HAP bit set, and we cannot relocate the FTPR partition.
+	# Some more general info on shrinking:
 	# https://github.com/corna/me_cleaner/wiki/External-flashing#neutralize-and-shrink-intel-me-useful-only-for-coreboot
 
 	# MFS is needed for deguard so we whitelist it here and also do not relocate the FTPR partition

boards/EOL_t480-hotp-maximized/EOL_t480-hotp-maximized.config

@@ -97,4 +97,4 @@ export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T480-hotp-maximized"
 export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
-BOARD_TARGETS := xx80_me_blobs
+BOARD_TARGETS := t480_me_blobs

boards/EOL_t480-maximized/EOL_t480-maximized.config

@@ -97,4 +97,4 @@ export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T480-maximized"
 export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
-BOARD_TARGETS := xx80_me_blobs
+BOARD_TARGETS := t480_me_blobs