soc: esp32c3: add flash dts values into cmake config

This configures soc and flash size definition
using DTSI information instead of hardcoded
values.

Signed-off-by: Sylvio Alves <[email protected]>

Author: sylvioalves

soc/riscv/esp32c3/CMakeLists.txt

@@ -9,6 +9,14 @@ zephyr_sources(
   loader.c
   )
 
+# get code-partition slot0 address
+dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
+dt_reg_addr(img_0_off PATH ${dts_partition_path})
+
+# get code-partition boot address
+dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
+dt_reg_addr(boot_off PATH ${dts_partition_path})
+
 if(CONFIG_BOOTLOADER_ESP_IDF)
   include(ExternalProject)
 
@@ -45,14 +53,14 @@ if(CONFIG_BOOTLOADER_ESP_IDF)
     CONFIGURE_COMMAND ""
     BUILD_COMMAND
     ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/components/partition_table/gen_esp32part.py -q
-    --offset 0x8000 --flash-size 4MB ${ESP_IDF_PATH}/components/partition_table/partitions_singleapp.csv ${espidf_build_dir}/partitions_singleapp.bin
+    --offset 0x8000 --flash-size ${CONFIG_ESPTOOLPY_FLASHSIZE} ${ESP_IDF_PATH}/components/partition_table/partitions_singleapp.csv ${espidf_build_dir}/partitions_singleapp.bin
     INSTALL_COMMAND ""
     )
 
   if(CONFIG_BUILD_OUTPUT_BIN)
     set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
       COMMAND ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/components/esptool_py/esptool/esptool.py
-      ARGS --chip esp32c3 elf2image --flash_mode dio --flash_freq 40m
+      ARGS --chip ${CONFIG_SOC} elf2image --flash_mode dio --flash_freq 40m --flash_size ${CONFIG_ESPTOOLPY_FLASHSIZE}
       -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin
       ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
   endif()
@@ -65,20 +73,10 @@ if(CONFIG_BOOTLOADER_ESP_IDF)
 
   board_finalize_runner_args(esp32 "--esp-flash-partition_table=${espidf_build_dir}/partitions_singleapp.bin")
 
-  board_finalize_runner_args(esp32 "--esp-boot-address=0x0000")
-
   board_finalize_runner_args(esp32 "--esp-partition-table-address=0x8000")
 
-  board_finalize_runner_args(esp32 "--esp-app-address=0x10000")
-
 endif()
 
-if(CONFIG_BOOTLOADER_MCUBOOT)
+board_finalize_runner_args(esp32 "--esp-boot-address=${boot_off}")
 
-  # get code-partition slot0 address
-  dt_nodelabel(dts_partition_path NODELABEL "slot0_partition")
-  dt_reg_addr(img_0_off PATH ${dts_partition_path})
-
-  board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")
-
-endif()
+board_finalize_runner_args(esp32 "--esp-app-address=${img_0_off}")

soc/riscv/esp32c3/Kconfig.soc

@@ -9,12 +9,30 @@ config SOC_ESP32C3
 	select CLOCK_CONTROL
 	select CLOCK_CONTROL_ESP32
 
+if SOC_ESP32C3
+
 config IDF_TARGET_ESP32C3
 	bool "ESP32C3 as target board"
 	default y
-	depends on SOC_ESP32C3
 
 config ESPTOOLPY_FLASHFREQ_80M
 	bool
 	default y
-	depends on SOC_ESP32C3
+
+config FLASH_SIZE
+	int
+	default $(dt_node_reg_size_int,/soc/flash-controller@60002000/flash@0,0)
+
+config FLASH_BASE_ADDRESS
+	hex
+	default $(dt_node_reg_addr_hex,/soc/flash-controller@60002000/flash@0)
+
+config ESPTOOLPY_FLASHSIZE
+	string
+	default "1MB" if FLASH_SIZE = 0x100000
+	default "2MB" if FLASH_SIZE = 0x200000
+	default "4MB" if FLASH_SIZE = 0x400000
+	default "8MB" if FLASH_SIZE = 0x800000
+	default "16MB" if FLASH_SIZE = 0x1000000
+
+endif