manifest: update Zephyr to remove deprecated Kconfig

Update Zephyr revision to remove a deprecated Kconfig Signed-off-by: Markus Rekdal <[email protected]>
nrfconnect · Aug 14, 2024 · 219f6a4 · 219f6a4
1 parent e7d7c68
commit 219f6a4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto b/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto
@@ -46,7 +46,7 @@ config BT_FAST_PAIR_CRYPTO_PSA
 	select PSA_WANT_ALG_SHA_256
 	select PSA_WANT_ALG_HMAC
 	select PSA_WANT_ALG_ECDH
-	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
+	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	select PSA_WANT_ECC_SECP_R1_256
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_ECB_NO_PADDING

diff --git a/subsys/nrf_security/cmake/psa_crypto_want_config.cmake b/subsys/nrf_security/cmake/psa_crypto_want_config.cmake
@@ -115,7 +115,6 @@ kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_DERIVE)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_DES)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_DH_KEY_PAIR)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY)
-kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE)
 kconfig_check_and_set_base_to_one(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT)

diff --git a/subsys/nrf_security/configs/psa_crypto_want_config.h.template b/subsys/nrf_security/configs/psa_crypto_want_config.h.template
@@ -124,7 +124,6 @@
 #cmakedefine PSA_WANT_KEY_TYPE_DES                              @PSA_WANT_KEY_TYPE_DES@
 #cmakedefine PSA_WANT_KEY_TYPE_DH_KEY_PAIR                      @PSA_WANT_KEY_TYPE_DH_KEY_PAIR@
 #cmakedefine PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY                    @PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY@
-#cmakedefine PSA_WANT_KEY_TYPE_ECC_KEY_PAIR                     @PSA_WANT_KEY_TYPE_ECC_KEY_PAIR@
 #cmakedefine PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC               @PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC@
 #cmakedefine PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE              @PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE@
 #cmakedefine PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT              @PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT@

diff --git a/west.yml b/west.yml
@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 42f34339b66261d8bc725f7e82b8c9a4d5d3ba79
+      revision: 8bd088c7c2936dbc94eddd5ede980d45a341e73d
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above