Cherry pick moving SRAM configuration to DTS

CMakeLists.txt

@@ -1880,12 +1880,27 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
   # are typically loaded to RAM
   if(NOT CONFIG_XIP)
     if(CONFIG_BUILD_OUTPUT_ADJUST_LMA)
-      math(EXPR code_address
+      if(CONFIG_SRAM_DEPRECATED_KCONFIG_SET)
+        math(EXPR code_address
           "${CONFIG_SRAM_BASE_ADDRESS} + ${CONFIG_BUILD_OUTPUT_ADJUST_LMA} + 0"
           OUTPUT_FORMAT HEXADECIMAL
-      )
+        )
+      else()
+        dt_chosen(chosen_sram_path PROPERTY "zephyr,sram")
+        dt_reg_addr(ram_addr PATH "${chosen_sram_path}")
+
+        math(EXPR code_address
+          "${ram_addr} + ${CONFIG_BUILD_OUTPUT_ADJUST_LMA} + 0"
+          OUTPUT_FORMAT HEXADECIMAL
+        )
+      endif()
     else()
-      set(code_address "${CONFIG_SRAM_BASE_ADDRESS}")
+      if(CONFIG_SRAM_DEPRECATED_KCONFIG_SET)
+        set(code_address ${CONFIG_SRAM_BASE_ADDRESS})
+      else()
+        dt_chosen(chosen_sram_path PROPERTY "zephyr,sram")
+        dt_reg_addr(code_address PATH "${chosen_sram_path}")
+      endif()
     endif()
   endif()
 

arch/Kconfig

@@ -223,24 +223,37 @@ config 64BIT
 	  soc/**/Kconfig, or boards/**/Kconfig and the user should generally
 	  avoid modifying it.
 
+config SRAM_DEPRECATED_KCONFIG_SET
+	bool
+	default y if SRAM_SIZE != $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM),0,K)
+	default y if SRAM_BASE_ADDRESS != $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
+	default n
+	select DEPRECATED
+	help
+	  Indicates that either `CONFIG_SRAM_SIZE` or `CONFIG_SRAM_BASE_ADDRESS` have been
+	  manually set, these Kconfigs are now deprecated and should be replaced by referencing
+	  the devicetree `zephyr,sram` chosen node instead.
+
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_SRAM := zephyr,sram
 
 config SRAM_SIZE
-	int "SRAM Size in kB"
+	int "SRAM Size in kB [DEPRECATED]"
 	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM),0,K)
 	help
 	  The SRAM size in kB. The default value comes from /chosen/zephyr,sram in
 	  devicetree. The user should generally avoid changing it via menuconfig or
-	  in configuration files.
+	  in configuration files. This option is now deprecated and must be replaced by referencing
+	  the devicetree `zephyr,sram` chosen node instead.
 
 config SRAM_BASE_ADDRESS
-	hex "SRAM Base Address"
+	hex "SRAM Base Address [DEPRECATED]"
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
 	help
 	  The SRAM base address. The default value comes from
 	  /chosen/zephyr,sram in devicetree. The user should generally avoid
-	  changing it via menuconfig or in configuration files.
+	  changing it via menuconfig or in configuration files. This option is now deprecated and
+	  must be replaced by referencing the devicetree `zephyr,sram` chosen node instead.
 
 config XIP
 	bool "Execute in place"

arch/arm/core/cortex_a_r/reboot.c

@@ -44,7 +44,7 @@ TOOLCHAIN_DISABLE_WARNING(TOOLCHAIN_WARNING_NONNULL)
 void __weak relocate_vector_table(void)
 {
 #if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) ||                                     \
-	!defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
+	!defined(CONFIG_XIP) && (DT_CHOSEN_SRAM_ADDR != 0)
 	write_sctlr(read_sctlr() & ~HIVECS);
 	size_t vector_size = (size_t)_vector_end - (size_t)_vector_start;
 	(void)arch_early_memcpy(VECTOR_ADDRESS, _vector_start, vector_size);

arch/arm/core/cortex_m/prep_c.c

@@ -74,7 +74,7 @@ void __weak relocate_vector_table(void)
 void __weak relocate_vector_table(void)
 {
 #if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) ||                                     \
-	!defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
+	!defined(CONFIG_XIP) && (DT_CHOSEN_SRAM_ADDR != 0)
 	size_t vector_size = (size_t)_vector_end - (size_t)_vector_start;
 	(void)memcpy(VECTOR_ADDRESS, _vector_start, vector_size);
 #elif defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)

arch/arm/core/mpu/arm_mpu_regions.c

@@ -41,11 +41,11 @@
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
 #else
-			 CONFIG_SRAM_BASE_ADDRESS,
+			 DT_CHOSEN_SRAM_ADDR,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
-			 ARM_MPU_SRAM_REGION_ATTR(CONFIG_SRAM_BASE_ADDRESS,
-				 CONFIG_SRAM_SIZE * 1024)),
+			 ARM_MPU_SRAM_REGION_ATTR(DT_CHOSEN_SRAM_ADDR,
+				 DT_CHOSEN_SRAM_SIZE)),
 #else
 			 ARM_MPU_SRAM_REGION_ATTR(REGION_SRAM_SIZE)),
 #endif
 

arch/arm64/core/CMakeLists.txt

@@ -22,7 +22,13 @@ zephyr_library_sources(
 # simple numeric comparison because these values may be
 # beyond the numeric range of integers for cmake.
 
-string(LENGTH "x${CONFIG_SRAM_BASE_ADDRESS}" SRAM_LENGTH)
+if(CONFIG_SRAM_DEPRECATED_KCONFIG_SET)
+  string(LENGTH "x${CONFIG_SRAM_BASE_ADDRESS}" SRAM_LENGTH)
+else()
+  dt_chosen(chosen_sram_path PROPERTY "zephyr,sram")
+  dt_reg_addr(ram_addr PATH "${chosen_sram_path}")
+  string(LENGTH "x${ram_addr}" SRAM_LENGTH)
+endif()
 string(LENGTH "x${CONFIG_KERNEL_VM_BASE}" KERNEL_VM_LENGTH)
 
 if(${SRAM_LENGTH} GREATER 11 OR ${KERNEL_VM_LENGTH} GREATER 11)

arch/arm64/core/Kconfig

@@ -382,7 +382,7 @@ config ARM64_PA_BITS
 config MAX_XLAT_TABLES
 	int "Maximum numbers of translation tables"
 	default 32 if USERSPACE && TEST && SMP
-	default 24 if USERSPACE && TEST
+	default 28 if USERSPACE && TEST
 	default 20 if USERSPACE && (ARM64_VA_BITS >= 40)
 	default 16 if USERSPACE
 	default 12 if (ARM64_VA_BITS >= 40)

arch/riscv/Kconfig

@@ -67,10 +67,13 @@ config RISCV_ALWAYS_SWITCH_THROUGH_ECALL
 	  and most people should say n here to minimize context switching
 	  overhead.
 
+DT_CHOSEN_Z_SRAM = zephyr,sram
+
 choice RISCV_CMODEL
 	prompt "RISC-V Code Model"
-	default RISCV_CMODEL_LARGE if (SRAM_BASE_ADDRESS > 0xffffffff) || \
-				      (KERNEL_VM_BASE > 0xffffffff)
+	default RISCV_CMODEL_LARGE if (SRAM_DEPRECATED_KCONFIG_SET && SRAM_BASE_ADDRESS > 0xffffffff) || \
+		(!SRAM_DEPRECATED_KCONFIG_SET && $(dt_chosen_reg_addr_int,$(DT_CHOSEN_Z_SRAM),0) > 0xffffffff) || \
+		(KERNEL_VM_BASE > 0xffffffff)
 	default RISCV_CMODEL_MEDANY if 64BIT
 	default RISCV_CMODEL_MEDLOW
 

arch/x86/Kconfig

@@ -356,9 +356,12 @@ config X86_MAX_ADDITIONAL_MEM_DOMAINS
 
 	  Zephyr test cases assume 3 additional domains can be instantiated.
 
+DT_CHOSEN_Z_SRAM = zephyr,sram
+
 config X86_EXTRA_PAGE_TABLE_PAGES
 	int "Reserve extra pages in page table"
-	default 1 if X86_PAE && (KERNEL_VM_BASE != SRAM_BASE_ADDRESS)
+	default 1 if X86_PAE && ((SRAM_DEPRECATED_KCONFIG_SET && KERNEL_VM_BASE != SRAM_BASE_ADDRESS) || \
+		(!SRAM_DEPRECATED_KCONFIG_SET && KERNEL_VM_BASE != $(dt_chosen_reg_addr_int,$(DT_CHOSEN_Z_SRAM),0)))
 	default 0
 	depends on X86_MMU
 	help

arch/x86/core/x86_mmu.c

@@ -1325,8 +1325,8 @@
 	pentry_t *entry_ptr;
 
 	k_mem_region_align((uintptr_t *)&pos, &size,
-			   (uintptr_t)CONFIG_SRAM_BASE_ADDRESS,
-			   (size_t)CONFIG_SRAM_SIZE * 1024U, scope);
+			   (uintptr_t)DT_CHOSEN_SRAM_ADDR,
+			   (size_t)DT_CHOSEN_SRAM_SIZE, scope);
 
 	while (size != 0U) {
 		/* Need to get to the correct table */

arch/x86/gen_mmu.py

@@ -69,16 +69,21 @@
 import array
 import ctypes
 import os
+import pickle
 import re
 import struct
 import sys
 import textwrap
+from pathlib import Path
 
 import elftools
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
 from packaging import version
 
+sys.path.append(str(Path(__file__).parents[2] / "scripts" / "dts" / "python-devicetree" / "src"))
+from devicetree import edtlib  # noqa: F401
+
 if version.parse(elftools.__version__) < version.parse('0.24'):
     sys.exit("pyelftools is out of date, need version 0.24 or later")
 
@@ -784,8 +789,17 @@ def main():
     vm_size = syms["CONFIG_KERNEL_VM_SIZE"]
     vm_offset = syms["CONFIG_KERNEL_VM_OFFSET"]
 
-    sram_base = syms["CONFIG_SRAM_BASE_ADDRESS"]
-    sram_size = syms["CONFIG_SRAM_SIZE"] * 1024
+    if isdef("CONFIG_SRAM_DEPRECATED_KCONFIG_SET"):
+        sram_base = syms["CONFIG_SRAM_BASE_ADDRESS"]
+        sram_size = syms["CONFIG_SRAM_SIZE"] * 1024
+    else:
+        edt_pickle_path = str(Path(args.kernel).parents[1] / "zephyr" / 'edt.pickle')
+        with open(edt_pickle_path, "rb") as f:
+            edt = pickle.load(f)
+        chosen_sram = edt.chosen_node("zephyr,sram")
+
+        sram_base = chosen_sram.regs[0].addr
+        sram_size = chosen_sram.regs[0].size
 
     mapped_kernel_base = syms["z_mapped_start"]
     mapped_kernel_size = syms["z_mapped_size"]

arch/xtensa/core/ptables.c

@@ -370,7 +370,7 @@
 	/* Store the bigger number. */
 	l2_page_tables_max_usage = MAX(l2_page_tables_max_usage, cur_l2_usage);
 
 	LOG_DBG("L2 page table usage %u/%u/%u", cur_l2_usage, l2_page_tables_max_usage,
 		CONFIG_XTENSA_MMU_NUM_L2_TABLES);
 #endif /* CONFIG_XTENSA_MMU_PAGE_TABLE_STATS */
 }
@@ -570,9 +570,9 @@
 	uintptr_t page;
 	int idx;
 
-	for (page = CONFIG_SRAM_BASE_ADDRESS, idx = 0;
+	for (page = DT_CHOSEN_SRAM_ADDR, idx = 0;
 	     page < (uintptr_t)z_mapped_start;
 	     page += CONFIG_MMU_PAGE_SIZE, idx++) {
 		k_mem_page_frame_set(&k_mem_page_frames[idx], K_MEM_PAGE_FRAME_RESERVED);
 	}
 }
@@ -694,7 +694,7 @@
 	bool is_user;
 
 	if (size == 0) {
 		LOG_ERR("Cannot map physical memory at 0x%08X: invalid "
 			"zero size", (uint32_t)phys);
 		k_panic();
 	}
@@ -856,12 +856,12 @@
 	k_spinlock_key_t key;
 
 	if (addr == NULL) {
 		LOG_ERR("Cannot unmap NULL pointer");
 		return;
 	}
 
 	if (size == 0) {
 		LOG_ERR("Cannot unmap virtual memory with zero size");
 		return;
 	}
 
@@ -1090,7 +1090,7 @@
 	/* Store the bigger number. */
 	l1_page_tables_max_usage = MAX(l1_page_tables_max_usage, cur_l1_usage);
 
 	LOG_DBG("L1 page table usage %u/%u/%u",	cur_l1_usage, l1_page_tables_max_usage,
 		CONFIG_XTENSA_MMU_NUM_L1_TABLES);
 #endif /* CONFIG_XTENSA_MMU_PAGE_TABLE_STATS */
 

boards/actinius/icarus/Kconfig.defconfig

@@ -3,8 +3,6 @@
 # Copyright (c) 2019 Actinius
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ACTINIUS_ICARUS
-
 source "boards/actinius/common/Kconfig"
 
 # For the secure version of the board the firmware is linked at the beginning
@@ -17,21 +15,5 @@ source "boards/actinius/common/Kconfig"
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_ACTINIUS_ICARUS_NRF9160 && TRUSTED_EXECUTION_SECURE
-
-if BOARD_ACTINIUS_ICARUS_NRF9160_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_ACTINIUS_ICARUS_NRF9160_NS
-
-endif # BOARD_ACTINIUS_ICARUS
+config BOARD_ACTINIUS_ICARUS
+	select USE_DT_CODE_PARTITION if BOARD_ACTINIUS_ICARUS_NRF9160_NS

boards/actinius/icarus_bee/Kconfig.defconfig

@@ -3,8 +3,6 @@
 # Copyright (c) 2021 Actinius
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ACTINIUS_ICARUS_BEE
-
 source "boards/actinius/common/Kconfig"
 
 # For the secure version of the board the firmware is linked at the beginning
@@ -17,21 +15,5 @@ source "boards/actinius/common/Kconfig"
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_ACTINIUS_ICARUS_BEE_NRF9160 && TRUSTED_EXECUTION_SECURE
-
-if BOARD_ACTINIUS_ICARUS_BEE_NRF9160_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_ACTINIUS_ICARUS_BEE_NRF9160_NS
-
-endif # BOARD_ACTINIUS_ICARUS_BEE
+config BOARD_ACTINIUS_ICARUS_BEE
+	select USE_DT_CODE_PARTITION if BOARD_ACTINIUS_ICARUS_BEE_NRF9160_NS

boards/actinius/icarus_som/Kconfig.defconfig

@@ -3,8 +3,6 @@
 # Copyright (c) 2021 Actinius
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ACTINIUS_ICARUS_SOM
-
 source "boards/actinius/common/Kconfig"
 
 # For the secure version of the board the firmware is linked at the beginning
@@ -17,21 +15,5 @@ source "boards/actinius/common/Kconfig"
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_ACTINIUS_ICARUS_SOM_NRF9160 && TRUSTED_EXECUTION_SECURE
-
-if BOARD_ACTINIUS_ICARUS_SOM_NRF9160_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_ACTINIUS_ICARUS_SOM_NRF9160_NS
-
-endif # BOARD_ACTINIUS_ICARUS_SOM
+config BOARD_ACTINIUS_ICARUS_SOM
+	select USE_DT_CODE_PARTITION if BOARD_ACTINIUS_ICARUS_SOM_NRF9160_NS

boards/actinius/icarus_som_dk/Kconfig.defconfig

@@ -3,8 +3,6 @@
 # Copyright (c) 2022 Actinius
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ACTINIUS_ICARUS_SOM_DK
-
 source "boards/actinius/common/Kconfig"
 
 # For the secure version of the board the firmware is linked at the beginning
@@ -17,21 +15,5 @@ source "boards/actinius/common/Kconfig"
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160 && TRUSTED_EXECUTION_SECURE
-
-if BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160_NS
-
-endif # BOARD_ACTINIUS_ICARUS_SOM_DK
+config BOARD_ACTINIUS_ICARUS_SOM_DK
+	select USE_DT_CODE_PARTITION if BOARD_ACTINIUS_ICARUS_SOM_DK_NRF9160_NS

boards/circuitdojo/feather/Kconfig.defconfig

@@ -4,8 +4,6 @@
 # Copyright (c) 2020 Circuit Dojo LLC
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_CIRCUITDOJO_FEATHER
-
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-
@@ -16,21 +14,5 @@ if BOARD_CIRCUITDOJO_FEATHER
 # Apply this configuration below by setting the Kconfig symbols used by
 # the linker according to the information extracted from DT partitions.
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-	depends on BOARD_CIRCUITDOJO_FEATHER_NRF9160 && TRUSTED_EXECUTION_SECURE
-
-if BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
-
-endif # BOARD_CIRCUITDOJO_FEATHER
+config BOARD_CIRCUITDOJO_FEATHER
+	select USE_DT_CODE_PARTITION if BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS