soc: nordic: uicr: Add support for uicr.SECONDARY.PROCESSOR

Add support for uicr.SECONDARY.PROCESSOR.

Signed-off-by: Sebastian Bøe <[email protected]>

Author: SebastianBoe

scripts/ci/check_compliance.py

@@ -1268,6 +1268,7 @@ def check_no_undef_outside_kconfig(self, kconf):
         "GEN_UICR_GENERATE_PERIPHCONF", # Used in specialized build tool, not part of main Kconfig
         "GEN_UICR_SECONDARY", # Used in specialized build tool, not part of main Kconfig
         "GEN_UICR_SECONDARY_GENERATE_PERIPHCONF", # Used in specialized build tool, not part of main Kconfig
+        "GEN_UICR_SECONDARY_PROCESSOR_VALUE", # Used in specialized build tool, not part of main Kconfig
         "GEN_UICR_SECURESTORAGE", # Used in specialized build tool, not part of main Kconfig
         "HEAP_MEM_POOL_ADD_SIZE_", # Used as an option matching prefix
         "HUGETLBFS",          # Linux, in boards/xtensa/intel_adsp_cavs25/doc

soc/nordic/common/uicr/gen_uicr.py

@@ -439,6 +439,12 @@ def main() -> None:
         type=lambda s: int(s, 0),
         help="Absolute flash address of the secondary firmware (decimal or 0x-prefixed hex)",
     )
+    parser.add_argument(
+        "--secondary-processor",
+        default=0xBD2328A8,
+        type=lambda s: int(s, 0),
+        help="Processor to boot for the secondary firmware ",
+    )
     parser.add_argument(
         "--secondary-periphconf-address",
         default=None,
@@ -562,6 +568,7 @@ def main() -> None:
         if args.secondary:
             uicr.SECONDARY.ENABLE = ENABLED_VALUE
             uicr.SECONDARY.ADDRESS = args.secondary_address
+            uicr.SECONDARY.PROCESSOR = args.secondary_processor
 
             # Handle secondary periphconf if provided
             if args.out_secondary_periphconf_hex:

soc/nordic/common/uicr/gen_uicr/CMakeLists.txt

@@ -154,6 +154,7 @@ if(CONFIG_GEN_UICR_SECONDARY)
 
   list(APPEND secondary_args
     --secondary-address ${SECONDARY_ADDRESS}
+    --secondary-processor ${CONFIG_GEN_UICR_SECONDARY_PROCESSOR_VALUE}
     )
 
   if(CONFIG_GEN_UICR_SECONDARY_GENERATE_PERIPHCONF)

soc/nordic/common/uicr/gen_uicr/Kconfig

@@ -10,17 +10,6 @@ config GEN_UICR_GENERATE_PERIPHCONF
 	  When enabled, the UICR generator will populate the
 	  periphconf_partition partition.
 
-config GEN_UICR_SECONDARY
-	bool "Enable UICR.SECONDARY.ENABLE"
-
-config GEN_UICR_SECONDARY_GENERATE_PERIPHCONF
-	bool "Generate SECONDARY.PERIPHCONF hex alongside UICR"
-	default y
-	depends on GEN_UICR_SECONDARY
-	help
-	  When enabled, the UICR generator will populate the
-	  secondary_periphconf_partition partition.
-
 config GEN_UICR_SECURESTORAGE
 	bool "Enable UICR.SECURESTORAGE"
 	default y
@@ -43,6 +32,43 @@ config GEN_UICR_SECURESTORAGE
 	  - At least one subpartition must be defined
 	  - Combined subpartition sizes must equal secure_storage_partition size
 
+config GEN_UICR_SECONDARY
+	bool "Enable UICR.SECONDARY.ENABLE"
+
+if GEN_UICR_SECONDARY
+
+config GEN_UICR_SECONDARY_GENERATE_PERIPHCONF
+	bool "Generate SECONDARY.PERIPHCONF hex alongside UICR"
+	default y
+	help
+	  When enabled, the UICR generator will populate the
+	  secondary_periphconf_partition partition.
+
+choice GEN_UICR_SECONDARY_PROCESSOR
+	prompt "Secondary processor selection"
+	default GEN_UICR_SECONDARY_PROCESSOR_APPLICATION
+	help
+	  Processor to boot for the secondary firmware.
+
+config GEN_UICR_SECONDARY_PROCESSOR_APPLICATION
+	bool "APPLICATION processor"
+	help
+	  Boot secondary firmware on the APPLICATION processor.
+
+config GEN_UICR_SECONDARY_PROCESSOR_RADIOCORE
+	bool "RADIOCORE processor"
+	help
+	  Boot secondary firmware on the RADIOCORE processor.
+
+endchoice
+
+config GEN_UICR_SECONDARY_PROCESSOR_VALUE
+	hex
+	default 0xBD2328A8 if GEN_UICR_SECONDARY_PROCESSOR_APPLICATION
+	default 0x1730C77F if GEN_UICR_SECONDARY_PROCESSOR_RADIOCORE
+
+endif # GEN_UICR_SECONDARY
+
 endmenu
 
 source "Kconfig.zephyr"