boards: Add nrf54lm20b where nrf54lm20a is used

nRF54LM20a and nRF54LM20b are functionally identical
in most of the cases. Added nRF54LM20B support
across build system and source files where nRF54LM20a
is explicitly mentioned.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>

Author: ahasztag

Kconfig.nrf

@@ -135,9 +135,9 @@ configdefault BT_TX_PROCESSOR_STACK_SIZE
 	default 624 if SOC_NRF54H20_CPUAPP
 	# nRF54L15 (application core)
 	default 900 if SOC_NRF54L15_CPUAPP
-	# nRF54L V10A / LM20A (currently application core EngA variants are used)
+	# nRF54L V10A / LM20 (A/B) (currently application core EngA variants are used)
 	default 900 if SOC_NRF54LV10A_CPUAPP
-	default 900 if SOC_NRF54LM20A_CPUAPP
+	default 900 if SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP
 
 if SOC_SERIES_BSIM_NRFXX && ENTROPY_GENERATOR
 config MBEDTLS_HEAP_SIZE

cmake/sysbuild/partition_manager.cmake

@@ -514,6 +514,7 @@ foreach(d APP ${PM_DOMAINS})
   sysbuild_get(${image_name}_CONFIG_SOC_NRF54L05_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L05_CPUAPP KCONFIG)
   sysbuild_get(${image_name}_CONFIG_SOC_NRF54L10_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L10_CPUAPP KCONFIG)
   sysbuild_get(${image_name}_CONFIG_SOC_NRF54LM20A_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LM20A_CPUAPP KCONFIG)
+  sysbuild_get(${image_name}_CONFIG_SOC_NRF54LM20B_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LM20B_CPUAPP KCONFIG)
   sysbuild_get(${image_name}_CONFIG_SOC_NRF54LV10A_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54LV10A_CPUAPP KCONFIG)
 
   if(${image_name}_CONFIG_SOC_SERIES_NRF91)

modules/trusted-firmware-m/Kconfig.tfm.pm

@@ -20,7 +20,7 @@ config PM_PARTITION_SIZE_TFM_SRAM
 	# has less RAM. The number was selected based on the observed memory
 	# usage of TFM in crypto samples and it can be changed later if needed.
 	default 0x10000 if SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_CPUAPP || \
-			   SOC_NRF54LM20A_CPUAPP
+			   SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP
 	default 0x16000 if SOC_SERIES_NRF91
 	default 0x30000
 	help

modules/trusted-firmware-m/tfm_boards/board/device_cfg.h

@@ -15,7 +15,7 @@
 
 #if defined(NRF54L15_XXAA) || defined(NRF54L10_XXAA) || \
 	defined(NRF54LV10A_XXAA) || defined(NRF54LM20A_XXAA) || \
-	defined(NRF7120_ENGA_XXAA)
+	defined(NRF54LM20B_XXAA) || defined(NRF7120_ENGA_XXAA)
 #if defined(CONFIG_TFM_SECURE_UART00) && DOMAIN_NS != 1U
 #define TFM_UART uart00
 #endif /* defined(CONFIG_TFM_SECURE_UART00) */
@@ -46,7 +46,7 @@
 #define TFM_UART uart1
 #endif /* defined(CONFIG_TFM_SECURE_UART1) */
 
-#endif /* NRF54L15_XXAA || NRF54L10_XXAA || NRF54LM20A_XXAA ||
+#endif /* NRF54L15_XXAA || NRF54L10_XXAA || NRF54LM20A_XXAA || NRF54LM20B_XXAA ||
 	* NRF54LV10A_XXAA || NRF7120_ENGA_XXAA
 	*/
 

scripts/reglock.py

@@ -42,14 +42,15 @@
     "nrf54l10",
     "nrf54l15",
     "nrf54lm20a",
+    "nrf54lm20b",
     "nrf54lv10a",
     "nrf54ls05b",
 ]
 
 def get_max_size_kb(soc):
     if soc in ["nrf54l05", "nrf54l10", "nrf54l15"]:
         return 31
-    elif soc in ["nrf54lm20a", "nrf54lv10a"]:
+    elif soc in ["nrf54lm20a", "nrf54lm20b", "nrf54lv10a"]:
         return 127
     elif soc in ["nrf54ls05b"]:
         return 1023

subsys/bootloader/Kconfig

@@ -30,13 +30,13 @@ config PM_PARTITION_SIZE_PROVISION
 	default 0x280 if SOC_SERIES_NRF91 || SOC_NRF5340_CPUAPP # Stored in OTP region
 	# Monotonic counter slot takes 4 bytes on nRF54L Series
 	default 0x460 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || \
-			 SOC_NRF54LV10A_CPUAPP || SOC_NRF54LM20A_CPUAPP
+			 SOC_NRF54LV10A_CPUAPP || SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP
 	default 0x280 if SOC_NRF5340_CPUNET # Second instance stored in internal flash of NET
 	default FPROTECT_BLOCK_SIZE
 	prompt "Flash space reserved for PROVISION" if !(SOC_NRF9160 || SOC_NRF5340_CPUAPP || \
 							 SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || \
 							 SOC_NRF54L10_CPUAPP || SOC_NRF54LV10A_CPUAPP || \
-							 SOC_NRF54LM20A_CPUAPP)
+							 SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP)
 help
 	  Flash space set aside for the PROVISION partition.
 
@@ -50,7 +50,7 @@ config PM_PARTITION_SIZE_B0_IMAGE
 	default FPROTECT_BLOCK_SIZE if SOC_SERIES_NRF91 || SOC_NRF5340_CPUAPP
 	default 0x3800 if SOC_NRF5340_CPUNET
 	default 0x7800 if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP || \
-			  SOC_NRF54LV10A_CPUAPP || SOC_NRF54LM20A_CPUAPP
+			  SOC_NRF54LV10A_CPUAPP || SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP
 	default 0x7000 if !B0_MIN_PARTITION_SIZE
 	default 0x4000
 	help
@@ -92,7 +92,7 @@ config SB_DISABLE_SELF_RWX_SUPPORTED
 	bool
 	default y if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP
 	default y if SOC_NRF54LV10A_CPUAPP
-	default y if SOC_NRF54LM20A_CPUAPP
+	default y if SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP
 
 config SB_DISABLE_SELF_RWX
 	bool "Disable read and execution on self NVM"
@@ -107,7 +107,7 @@ config SB_DISABLE_NEXT_W
 	help
 	  NSIB disables writes on next stage in bootloading chain.
 	  It uses RRAMC's region 4 and is limited to 31KB for nRF54L15, nRF54L10 and nRF54L05
-	  and to 127KB for nRF54LV10a and nRF54LM20a.
+	  and to 127KB for nRF54LV10a and nRF54LM20 (A/B).
 
 config SB_MONOTONIC_COUNTER_ROLLBACK_PROTECTION
 	bool "HW monotonic version counter rollback protection (informative only, do not change)"

subsys/bootloader/bl_boot/bl_boot.c

@@ -32,7 +32,8 @@
 #if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54L05_CPUAPP) ||                  \
 	defined(CONFIG_SOC_NRF54L10_CPUAPP)
 #define MAX_NEXT_W_SIZE (31 * 1024)
-#elif defined(CONFIG_SOC_NRF54LV10A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20A_CPUAPP)
+#elif defined(CONFIG_SOC_NRF54LV10A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20A_CPUAPP) ||            \
+	defined(CONFIG_SOC_NRF54LM20B_CPUAPP)
 #define MAX_NEXT_W_SIZE (127 * 1024)
 #elif defined(CONFIG_SOC_NRF54LS05B_CPUAPP)
 #define MAX_NEXT_W_SIZE (1023 * 1024)

subsys/partition_manager/CMakeLists.txt

@@ -76,7 +76,8 @@ if(CONFIG_NRF_MODEM_LIB)
 endif()
 
 if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L05_CPUAPP OR
-   CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54LM20A_CPUAPP)
+   CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54LM20A_CPUAPP OR
+   CONFIG_SOC_NRF54LM20B_CPUAPP)
   ncs_add_partition_manager_config(pm.yml.bootconf)
 endif()
 

subsys/partition_manager/Kconfig

@@ -7,7 +7,7 @@
 menu "Partition Manager"
 	depends on SOC_SERIES_NRF52 || SOC_SERIES_NRF53 || SOC_SERIES_NRF91 || \
 		SOC_NRF54L05 || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A || \
-		SOC_NRF54LM20B || SOC_NRF54LV10A || SOC_NRF54LS05B
+		SOC_NRF54LM20B_CPUAPP || SOC_NRF54LV10A || SOC_NRF54LS05B
 
 config PARTITION_MANAGER_ENABLED
 	bool "Partition manager is enabled (read-only option)"

subsys/partition_manager/pm.yml.settings

@@ -4,7 +4,7 @@
 # TF-M non-secure application to avoid splitting the secure/non-secure
 # partitions more than necessary.
 #if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_CPUAPP) || \
-    defined(CONFIG_SOC_NRF54LM20A_CPUAPP)
+    defined(CONFIG_SOC_NRF54LM20A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20B_CPUAPP)
 settings_storage:
   placement:
     after: [app]