commit c45d9ac4c2b6affb87e5128f04c4bcba15ca2b6d
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Sep 19 22:17:05 2025 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Sep 24 17:20:35 2025 +0200
tree 1b562e06885f78d9db67fd443837f47af18ffc22
parent cc1ac1d3dccfc87dacd29743358e36e41c5cd5f4

Allow setting removed options that are now always on

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

scripts/generate_config_checks.py

diff --git a/scripts/generate_config_checks.py b/scripts/generate_config_checks.py
index a2a174b..bae93c3 100755
--- a/scripts/generate_config_checks.py
+++ b/scripts/generate_config_checks.py
@@ -16,6 +16,11 @@
 class CryptoOption(SubprojectOption):
     SUBPROJECT = 'psa/crypto_config.h'
 
+ALWAYS_ENABLED_SINCE_4_0 = frozenset([
+    'MBEDTLS_PSA_CRYPTO_CONFIG',
+    'MBEDTLS_USE_PSA_CRYPTO',
+])
+
 def checkers_for_removed_options() -> Iterator[Checker]:
     """Discover removed options. Yield corresponding checkers."""
     history = config_history.ConfigHistory()
@@ -24,6 +29,8 @@
     crypto_public = history.options('tfpsacrypto', '1.0')
     crypto_internal = history.internal('tfpsacrypto', '1.0')
     for option in sorted(old_public - new_public):
+        if option in ALWAYS_ENABLED_SINCE_4_0:
+            continue
         if option in crypto_public:
             yield CryptoOption(option)
         elif option in crypto_internal: