[nrf noup] boot: zephyr: Update nRF Soc Kconfigs

Updates Kconfigs for SoC selection due to a Kconfig change

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

boot/zephyr/Kconfig

@@ -248,8 +248,8 @@ choice BOOT_SIGNATURE_TYPE
 
 config BOOT_SIGNATURE_TYPE_NONE
 	bool "No signature; use only hash check"
-	select BOOT_USE_TINYCRYPT if !SOC_SERIES_NRF54LX
-	select BOOT_USE_PSA_CRYPTO if SOC_SERIES_NRF54LX
+	select BOOT_USE_TINYCRYPT if !SOC_SERIES_NRF54L
+	select BOOT_USE_PSA_CRYPTO if SOC_SERIES_NRF54L
 	select BOOT_IMG_HASH_ALG_SHA256_ALLOW
 
 config BOOT_SIGNATURE_TYPE_RSA
@@ -423,7 +423,7 @@ config BOOT_SIGNATURE_KMU_SLOTS
 
 config NCS_BOOT_SIGNATURE_KMU_UROT_MAPPING
 	bool "Use original mapping [DEPRECATED]"
-	depends on SOC_SERIES_NRF54LX
+	depends on SOC_SERIES_NRF54L
 	depends on MCUBOOT_MCUBOOT_IMAGE_NUMBER = -1
 	select DEPRECATED
 	help
@@ -810,7 +810,7 @@ if BOOT_ENCRYPT_X25519 && BOOT_USE_PSA_CRYPTO
 
 choice BOOT_HMAC_SHA
 	prompt "SHA used for HMAC and HKDF in encryption key exchange"
-	default BOOT_HMAC_SHA512 if BOOT_ENCRYPT_X25519 && SOC_SERIES_NRF54LX
+	default BOOT_HMAC_SHA512 if BOOT_ENCRYPT_X25519 && SOC_SERIES_NRF54L
 	default BOOT_HMAC_SHA256
 	help
 	  HMAC/HKDF sha algorithm may be selected to synchronize sha
@@ -1156,7 +1156,7 @@ config MCUBOOT_DOWNGRADE_PREVENTION_SECURITY_COUNTER
 config MCUBOOT_HW_DOWNGRADE_PREVENTION_COUNTER_LIMITED
 	bool "HW based downgrade prevention counter has limited number of updates"
 	depends on MCUBOOT_HW_DOWNGRADE_PREVENTION
-	default y if SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X || SOC_SERIES_NRF54LX
+	default y if SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91 || SOC_SERIES_NRF54L
 	help
 	  When this option is set, the hardware downgrade prevention counter
 	  has limited number of updates. This option will enable checking

boot/zephyr/flash_map_extended.c

@@ -60,7 +60,7 @@ BOOT_LOG_MODULE_DECLARE(mcuboot);
 #define FLASH_DEVICE_BASE 0
 #define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash_controller)
 
-#elif (defined(CONFIG_SOC_SERIES_NRF54HX) && DT_HAS_CHOSEN(zephyr_flash))
+#elif (defined(CONFIG_SOC_SERIES_NRF54H) && DT_HAS_CHOSEN(zephyr_flash))
 
 #define FLASH_DEVICE_ID SOC_FLASH_0_ID
 #define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS

boot/zephyr/include/target.h

@@ -32,11 +32,11 @@
 /*
  * Sanity check the target support.
  */
-#if (!defined(CONFIG_XTENSA) && !defined(CONFIG_SOC_SERIES_NRF54HX) && \
+#if (!defined(CONFIG_XTENSA) && !defined(CONFIG_SOC_SERIES_NRF54H) && \
     !DT_HAS_CHOSEN(zephyr_flash_controller)) || \
     (defined(CONFIG_XTENSA) && !DT_NODE_EXISTS(DT_INST(0, jedec_spi_nor)) && \
     !defined(CONFIG_SOC_FAMILY_ESPRESSIF_ESP32)) || \
-    (defined(CONFIG_SOC_SERIES_NRF54HX) && !DT_HAS_CHOSEN(zephyr_flash)) || \
+    (defined(CONFIG_SOC_SERIES_NRF54H) && !DT_HAS_CHOSEN(zephyr_flash)) || \
     !defined(FLASH_ALIGN) ||                  \
     !(FIXED_PARTITION_EXISTS(slot0_partition)) || \
     !(FIXED_PARTITION_EXISTS(slot1_partition) || CONFIG_SINGLE_APPLICATION_SLOT) || \

boot/zephyr/nrf_cleanup.c

@@ -140,7 +140,7 @@ void nrf_cleanup_peripheral(void)
         nrfy_uarte_event_clear(current, NRF_UARTE_EVENT_RXTO);
         nrfy_uarte_disable(current);
 
-#ifndef CONFIG_SOC_SERIES_NRF54LX
+#ifndef CONFIG_SOC_SERIES_NRF54L
         /* Disconnect pins UARTE pins
          * causes issues on nRF54l SoCs,
          * could be enabled once fix to NCSDK-33039 will be implemented.