Commit e5872497 authored by Sylvio Alves's avatar Sylvio Alves Committed by Carles Cufi
Browse files

soc: espressif: esp32: update to hal_espressif v5.1 



Modify and reorganize SoC to meet updated hal.

Signed-off-by: default avatarSylvio Alves <sylvio.alves@espressif.com>
Signed-off-by: default avatarLucas Tamborrino <lucas.tamborrino@espressif.com>
parent e63ddb70

arch/xtensa/core/xtensa_backtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "xtensa_backtrace.h"

#include <zephyr/sys/printk.h>

#if defined(CONFIG_SOC_SERIES_ESP32)

#include "soc/soc_memory_layout.h"

#include <esp_memory_utils.h>

#elif defined(CONFIG_SOC_FAMILY_INTEL_ADSP)

#include "debug_helpers.h"

#elif defined(CONFIG_SOC_XTENSA_DC233C)

include/zephyr/dt-bindings/clock/esp32_clock.h

+4 −4
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#define ESP32_CLK_CPU_240M             240000000



/* Supported XTAL Frequencies */

#define ESP32_CLK_XTAL_24M             0U

#define ESP32_CLK_XTAL_26M             1U

#define ESP32_CLK_XTAL_40M             2U

#define ESP32_CLK_XTAL_AUTO            3U

#define ESP32_CLK_XTAL_24M             24

#define ESP32_CLK_XTAL_26M             26

#define ESP32_CLK_XTAL_40M             40

#define ESP32_CLK_XTAL_AUTO            0



/* Supported RTC fast clock frequencies */

#define ESP32_RTC_FAST_CLK_FREQ_8M     8500000U

scripts/west_commands/runners/esp32.py

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class Esp32BinaryRunner(ZephyrBinaryRunner): 
        parser.add_argument(

            '--esp-tool',

            help='''if given, complete path to espidf. default is to search for

            it in [ESP_IDF_PATH]/components/esptool_py/esptool/esptool.py''')

            it in [ESP_IDF_PATH]/tools/esptool_py/esptool.py''')

        parser.add_argument('--esp-flash-bootloader',

                            help='Bootloader image to flash')

        parser.add_argument('--esp-flash-partition_table',
@@ -86,8 +86,8 @@ class Esp32BinaryRunner(ZephyrBinaryRunner): 
        if args.esp_tool:

            espidf = args.esp_tool

        else:

            espidf = path.join(args.esp_idf_path, 'components', 'esptool_py',

                               'esptool', 'esptool.py')

            espidf = path.join(args.esp_idf_path, 'tools', 'esptool_py',

                               'esptool.py')



        return Esp32BinaryRunner(

            cfg, args.esp_device, boot_address=args.esp_boot_address,

soc/espressif/Kconfig

+39 −0
Original line number Diff line number Diff line
@@ -5,4 +5,43 @@ if SOC_FAMILY_ESPRESSIF_ESP32 


rsource "*/Kconfig"



menu "MAC Config"



config ESP_MAC_ADDR_UNIVERSE_WIFI_STA

	bool



config ESP_MAC_ADDR_UNIVERSE_WIFI_AP

	bool



config ESP_MAC_ADDR_UNIVERSE_ETH

	bool



config ESP_MAC_ADDR_UNIVERSE_BT

	bool



config ESP_MAC_UNIVERSAL_MAC_ADDRESSES_ONE

	bool



config ESP_MAC_UNIVERSAL_MAC_ADDRESSES_TWO

	bool



config ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR

	bool



# Insert chip-specific MAC config

rsource "*/Kconfig.mac"



endmenu



menu "RTC Clock Config"



config ESP_SYSTEM_RTC_EXT_XTAL

	bool



config ESP_SYSTEM_RTC_EXT_OSC

	bool



rsource "*/Kconfig.rtc"

endmenu



endif # SOC_FAMILY_ESPRESSIF_ESP32

soc/espressif/esp32/CMakeLists.txt

+20 −46
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ if(CONFIG_SOC_ESP32_APPCPU) 
else()

  zephyr_sources(

    soc.c

    loader.c

    esp32-mp.c

    ../common/loader.c

    )

endif()
@@ -23,60 +23,31 @@ zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) 
math(EXPR esptoolpy_flashsize "${CONFIG_FLASH_SIZE} / 0x100000")



if(CONFIG_BOOTLOADER_ESP_IDF)

  include(ExternalProject)



  ## we use hello-world project, but I think any can be used.

  set(espidf_components_dir   ${ESP_IDF_PATH}/components)

  set(espidf_prefix    ${CMAKE_BINARY_DIR}/esp-idf)

  set(espidf_build_dir ${espidf_prefix}/build)



  ExternalProject_Add(

    EspIdfBootloader

    PREFIX ${espidf_prefix}

    SOURCE_DIR ${espidf_components_dir}/bootloader/subproject

    BINARY_DIR ${espidf_build_dir}/bootloader

    CONFIGURE_COMMAND

    ${CMAKE_COMMAND} -G${CMAKE_GENERATOR}

    -S ${espidf_components_dir}/bootloader/subproject

    -B ${espidf_build_dir}/bootloader -DSDKCONFIG=${espidf_build_dir}/sdkconfig

    -DIDF_PATH=${ESP_IDF_PATH} -DIDF_TARGET=${CONFIG_SOC_SERIES}

    -DPYTHON_DEPS_CHECKED=1

    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

    -DCMAKE_ASM_COMPILER=${CMAKE_ASM_COMPILER}

    -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}

    -DPYTHON=${PYTHON_EXECUTABLE}

    BUILD_COMMAND

    ${CMAKE_COMMAND} --build .

    INSTALL_COMMAND ""      # This particular build system has no install command

    )



  ExternalProject_Add(

    EspPartitionTable

    SOURCE_DIR ${espidf_components_dir}/partition_table

    BINARY_DIR ${espidf_build_dir}

    CONFIGURE_COMMAND ""

    BUILD_COMMAND

    ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/components/partition_table/gen_esp32part.py -q

    --offset 0x8000 --flash-size ${esptoolpy_flashsize}MB ${ESP_IDF_PATH}/components/partition_table/partitions_singleapp.csv ${espidf_build_dir}/partitions_singleapp.bin

    INSTALL_COMMAND ""

    )



  set_property(TARGET bintools PROPERTY disassembly_flag_inline_source)

  set(bootloader_dir "${ZEPHYR_HAL_ESPRESSIF_MODULE_DIR}/zephyr/blobs/lib/${CONFIG_SOC_SERIES}")



  add_dependencies(app EspIdfBootloader EspPartitionTable)

  if(EXISTS "${bootloader_dir}/bootloader-${CONFIG_SOC_SERIES}.bin")

    file(COPY "${bootloader_dir}/bootloader-${CONFIG_SOC_SERIES}.bin" DESTINATION ${CMAKE_BINARY_DIR})

    file(RENAME "${CMAKE_BINARY_DIR}/bootloader-${CONFIG_SOC_SERIES}.bin" "${CMAKE_BINARY_DIR}/bootloader.bin")

  endif()



  board_finalize_runner_args(esp32 "--esp-flash-bootloader=${espidf_build_dir}/bootloader/bootloader.bin")

  if(EXISTS "${bootloader_dir}/partition-table-${CONFIG_SOC_SERIES}.bin")

    file(COPY "${bootloader_dir}/partition-table-${CONFIG_SOC_SERIES}.bin" DESTINATION ${CMAKE_BINARY_DIR})

    file(RENAME "${CMAKE_BINARY_DIR}/partition-table-${CONFIG_SOC_SERIES}.bin" "${CMAKE_BINARY_DIR}/partition-table.bin")

  endif()

  board_finalize_runner_args(esp32 "--esp-flash-bootloader=${CMAKE_BINARY_DIR}/bootloader.bin")



  board_finalize_runner_args(esp32 "--esp-flash-partition_table=${espidf_build_dir}/partitions_singleapp.bin")

  board_finalize_runner_args(esp32 "--esp-flash-partition_table=${CMAKE_BINARY_DIR}/partition-table.bin")



  board_finalize_runner_args(esp32 "--esp-partition-table-address=0x8000")



endif()



if(CONFIG_MCUBOOT OR CONFIG_BOOTLOADER_ESP_IDF)



  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

      COMMAND ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/esptool_py/esptool.py

      ARGS --chip esp32 elf2image --flash_mode dio --flash_freq 40m --flash_size ${esptoolpy_flashsize}MB

      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin

      ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.elf)
@@ -85,10 +56,12 @@ if(CONFIG_MCUBOOT OR CONFIG_BOOTLOADER_ESP_IDF) 
  if(CONFIG_MCUBOOT)

    board_finalize_runner_args(esp32 "--esp-flash-bootloader=${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.bin")

  endif()



endif()



## When building for APPCPU

if (CONFIG_SOC_ESP32_APPCPU)



  if(CONFIG_BUILD_OUTPUT_BIN)

    set_property(GLOBAL APPEND PROPERTY extra_post_build_commands

      COMMAND ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/tools/esp_bin2c_array.py
@@ -96,6 +69,7 @@ if(CONFIG_SOC_ESP32_APPCPU) 
      -o ${CMAKE_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.c

      -a "esp32_appcpu_fw_array")

  endif()



else()

  set_property(TARGET bintools PROPERTY disassembly_flag_inline_source)

CRA Git | Maintained and supported by SUSTech CRA and CCSE