samples: bluetooth: Remove nRF54LM20 crypto workaround

rugeGerritsen · nordicjm · commit 4c369f28a9a7 · 2025-08-27T08:02:09.000+01:00
Since the CRACEN HW peripheral can now properly handle the
Bluetooth cryptography requirements, the application configuration
can be safely switched from software cryptography to
hardware cryptography that is based on the CRACEN peripheral.

Ref: NCSDK-33313

Signed-off-by: Rubin Gerritsen &lt;rubin.gerritsen@nordicsemi.no&gt;
diff --git a/samples/bluetooth/central_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/central_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 # Disable the unspupported UART0 driver
 CONFIG_NRFX_UARTE0=n
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
diff --git a/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 # Disable the unspupported UART0 driver
 CONFIG_NRFX_UARTE0=n
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
diff --git a/samples/bluetooth/peripheral_lbs/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
diff --git a/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf
diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
diff --git a/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_power_profiling/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 # Disable the unspupported UART0 driver
 CONFIG_NRFX_UARTE0=n
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf
@@ -6,23 +6,3 @@
 
 # Disable the unspupported UART0 driver
 CONFIG_NRFX_UARTE0=n
-
-# Workaround for issue NCSDK-33313
-
-# Disable Cracken for all but RNG, and switch to software crypto.
-
-CONFIG_PSA_CRYPTO_DRIVER_OBERON=y
-CONFIG_PSA_CRYPTO_DRIVER_CRACEN=y
-
-CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=n
-CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
-CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
-CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
-CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
-CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
-CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
-
-# END of Workaround for issue NCSDK-33313
