Skip to content

Commit be7517a

Browse files
AdrianSoundyAdrianSoundy
committed
Update to IDF 5.4.1 and add basic ESP32_P4
1 parent ac009d5 commit be7517a

File tree

96 files changed

+14871
-7596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+14871
-7596
lines changed

‎.devcontainer/All/Dockerfile.All.SRC‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
9292
RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
9393

9494
# Clone ESP-IDF
95-
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
95+
RUN git clone --branch v5.4.1 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
9696

9797
# Clone what is needed for TI
9898
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \

‎.devcontainer/ESP32/Dockerfile.ESP32.SRC‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN mkdir -p /usr/local/bin/gcc
4848
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
4949

5050
# Clone ESP-IDF
51-
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
51+
RUN git clone --branch v5.4.1 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
5252

5353
# Creating static link python for pyhton3
5454
RUN ln -fs /usr/bin/python3 /usr/bin/python \

‎CMake/Modules/ESP32_P4_GCC_options.cmake‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#
2+
# Copyright (c) .NET Foundation and Contributors
3+
# See LICENSE file in the project root for full license information.
4+
#
5+
6+
# need to specify linker flags here
7+
set(CMAKE_EXE_LINKER_FLAGS " -Wl,--print-memory-usage " CACHE INTERNAL "executable linker flags")
8+
9+
# TARGET parameter to set the target that's setting them for
10+
# optional EXTRA_COMPILE_OPTIONS with compile options to be added
11+
macro(nf_set_compile_options)
12+
13+
# parse arguments
14+
cmake_parse_arguments(NFSCO "" "TARGET" "EXTRA_COMPILE_OPTIONS" ${ARGN})
15+
16+
if(NOT NFSCO_TARGET OR "${NFSCO_TARGET}" STREQUAL "")
17+
message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_options()")
18+
endif()
19+
20+
# include any extra options coming from any extra args?
21+
target_compile_options(${NFSCO_TARGET} PUBLIC ${NFSCO_EXTRA_COMPILE_OPTIONS} -Wall -Wextra -Werror -Wno-sign-compare -Wno-unused-parameter -Wshadow -Wimplicit-fallthrough -fshort-wchar -fno-builtin -fno-common -fno-exceptions -fcheck-new )
22+
23+
# this series has FPU
24+
target_compile_definitions(${NFSCO_TARGET} PUBLIC -DTARGET=esp32c6 -DUSE_FPU=TRUE -DPLATFORM_ESP32 -DESP_PLATFORM)
25+
26+
endmacro()
27+
28+
# TARGET parameter to set the target that's setting them for
29+
# optional EXTRA_LINK_FLAGS with link flags to be added
30+
macro(nf_set_link_options)
31+
32+
# parse arguments
33+
cmake_parse_arguments(NFSLO "" "TARGET;EXTRA_LINK_FLAGS" "" ${ARGN})
34+
35+
if(NOT NFSLO_TARGET OR "${NFSLO_TARGET}" STREQUAL "")
36+
message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
37+
endif()
38+
39+
# set optimization linker flags for RELEASE and MinSizeRel
40+
if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
41+
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os ")
42+
endif()
43+
44+
# include libraries in build
45+
nf_include_libraries_in_build(${NFSLO_TARGET})
46+
47+
# set extra linker flags
48+
set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " ${NFSLO_EXTRA_LINK_FLAGS} ")
49+
50+
# set optimization flags
51+
nf_set_optimization_options(${NFSLO_TARGET})
52+
53+
endmacro()

‎CMake/Modules/ESP32_P4_sources.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#
2+
# Copyright (c) .NET Foundation and Contributors
3+
# See LICENSE file in the project root for full license information.
4+
#

‎CMake/Modules/FindESP32_IDF.cmake‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ FetchContent_GetProperties(esp32_idf)
99
include(binutils.ESP32)
1010

1111
list(APPEND ESP32_IDF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/config)
12-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${TARGET_SERIES_SHORT})
13-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${TARGET_SERIES_SHORT}/include)
12+
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${TARGET_SERIES_SHORT})
13+
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${TARGET_SERIES_SHORT}/include)
1414
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${TARGET_SERIES_SHORT}/esp_rom/include)
1515
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${ESP32_CPU_TYPE}/include)
1616
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/${ESP32_CPU_TYPE}/${TARGET_SERIES_SHORT}/include)
@@ -21,21 +21,25 @@ list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/hal/includ
2121
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/hal/${TARGET_SERIES_SHORT}/include)
2222
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/soc/${TARGET_SERIES_SHORT}/include)
2323
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/soc/${TARGET_SERIES_SHORT}/include/soc)
24+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/soc/${TARGET_SERIES_SHORT}/register)
2425
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_hw_support/include)
26+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_hw_support/dma/include)
2527
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_hw_support/include/soc)
2628

27-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/include)
28-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/gptimer/include)
29-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/uart/include)
30-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/gpio/include)
31-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/spi/include)
29+
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/include)
30+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_gptimer/include)
31+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_uart/include)
32+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_gpio/include)
33+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_spi/include)
34+
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_i2c/include)
3235
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/i2c/include)
33-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/i2s/include)
34-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/dac/include)
35-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/ledc/include)
36-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/pcnt/include)
37-
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/rmt/include)
38-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/sdmmc/include)
36+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_i2s/include)
37+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_dac/include)
38+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_ledc/include)
39+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_pcnt/include)
40+
#list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_rmt/include)
41+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_sdmmc/include)
42+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_sdspi/include)
3943

4044
# Use depecated drivers for RMT, I2S etc
4145
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/deprecated)
@@ -58,6 +62,7 @@ list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_ringbu
5862
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_timer/include)
5963
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_system/include)
6064
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_wifi/include)
65+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_wifi/include/local)
6166
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_partition/include)
6267
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_pm/include)
6368
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/fatfs/diskio)
@@ -86,11 +91,12 @@ list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/sdmmc/incl
8691
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/soc/include)
8792
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/vfs/include)
8893
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/wear_levelling/include)
89-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/driver/usb_serial_jtag/include)
94+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_driver_usb_serial_jtag/include)
9095

91-
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/include/${TARGET_SERIES_SHORT}/rom)
9296
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/include)
9397
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/${TARGET_SERIES_SHORT})
98+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/${TARGET_SERIES_SHORT}/include)
99+
list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/${TARGET_SERIES_SHORT}/include/${TARGET_SERIES_SHORT}/rom)
94100

95101
# includes specific to ESP32S2 and ESP32S3
96102
if(${TARGET_SERIES_SHORT} STREQUAL "esp32s2" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32s3")

‎CMake/binutils.ESP32.cmake‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ function(nf_set_esp32_target_series)
184184
set(TARGET_SERIES_SHORT ${TARGET_SERIES_2} CACHE INTERNAL "ESP32 target series lower case, short version")
185185

186186
# set the CPU type
187-
if(${TARGET_SERIES_SHORT} STREQUAL "esp32c3" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32c6" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32h2" )
187+
if(${TARGET_SERIES_SHORT} STREQUAL "esp32c3" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32c6" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32h2" OR ${TARGET_SERIES_SHORT} STREQUAL "esp32p4")
188188
set(ESP32_CPU_TYPE "riscv" CACHE INTERNAL "Setting CPU type")
189189
else()
190190
set(ESP32_CPU_TYPE "xtensa" CACHE INTERNAL "Setting CPU type")
@@ -468,6 +468,7 @@ macro(nf_setup_partition_tables_generator)
468468
${TARGET_SERIES_SHORT} STREQUAL "esp32c3" OR
469469
${TARGET_SERIES_SHORT} STREQUAL "esp32c6" OR
470470
${TARGET_SERIES_SHORT} STREQUAL "esp32h2" OR
471+
${TARGET_SERIES_SHORT} STREQUAL "esp32p4" OR
471472
${TARGET_SERIES_SHORT} STREQUAL "esp32s2" OR
472473
${TARGET_SERIES_SHORT} STREQUAL "esp32s3")
473474

@@ -482,6 +483,7 @@ macro(nf_setup_partition_tables_generator)
482483

483484
if(${TARGET_SERIES_SHORT} STREQUAL "esp32" OR
484485
${TARGET_SERIES_SHORT} STREQUAL "esp32c6" OR
486+
${TARGET_SERIES_SHORT} STREQUAL "esp32p4" OR
485487
${TARGET_SERIES_SHORT} STREQUAL "esp32s2" OR
486488
${TARGET_SERIES_SHORT} STREQUAL "esp32s3")
487489

@@ -501,7 +503,8 @@ macro(nf_setup_partition_tables_generator)
501503

502504
endif()
503505

504-
if(${TARGET_SERIES_SHORT} STREQUAL "esp32s3")
506+
if(${TARGET_SERIES_SHORT} STREQUAL "esp32s3" OR
507+
${TARGET_SERIES_SHORT} STREQUAL "esp32p4")
505508

506509
# 32MB partition table for ESP32_S3
507510
add_custom_command( TARGET ${NANOCLR_PROJECT_NAME}.elf POST_BUILD
@@ -599,6 +602,11 @@ macro(nf_add_idf_as_library)
599602
endif()
600603

601604
nf_install_idf_component_from_registry(littlefs 4831aa41-8b72-48ac-a534-910a985a5519)
605+
606+
if(${TARGET_SERIES_SHORT} STREQUAL "esp32p4")
607+
nf_install_idf_component_from_registry(esp_wifi_remote af68cf54-0998-4681-b3b3-7776920067b5)
608+
nf_install_idf_component_from_registry(esp_hosted dd94b9d3-b756-41b1-be36-d3a4d0b0bde7)
609+
endif()
602610

603611
include(${IDF_PATH_CMAKED}/tools/cmake/idf.cmake)
604612

@@ -670,7 +678,6 @@ macro(nf_add_idf_as_library)
670678
freertos
671679
esptool_py
672680
fatfs
673-
esp_wifi
674681
esp_event
675682
vfs
676683
esp_netif
@@ -686,7 +693,6 @@ macro(nf_add_idf_as_library)
686693
idf::freertos
687694
idf::esptool_py
688695
idf::fatfs
689-
idf::esp_wifi
690696
idf::esp_event
691697
idf::vfs
692698
idf::esp_netif
@@ -695,6 +701,17 @@ macro(nf_add_idf_as_library)
695701
idf::littlefs
696702
)
697703

704+
# Needed for remote Wifi module on P4 boards
705+
if(${TARGET_SERIES_SHORT} STREQUAL "esp32p4")
706+
list(APPEND IDF_COMPONENTS_TO_ADD esp_wifi_remote)
707+
list(APPEND IDF_COMPONENTS_TO_ADD esp_hosted)
708+
list(APPEND IDF_LIBRARIES_TO_ADD idf::esp_hosted)
709+
list(APPEND IDF_LIBRARIES_TO_ADD idf::esp_wifi_remote)
710+
else()
711+
list(APPEND IDF_COMPONENTS_TO_ADD esp_wifi)
712+
list(APPEND IDF_LIBRARIES_TO_ADD idf::esp_wifi)
713+
endif()
714+
698715
if(HAL_USE_BLE_OPTION)
699716
list(APPEND IDF_COMPONENTS_TO_ADD bt)
700717
list(APPEND IDF_LIBRARIES_TO_ADD idf::bt)
@@ -917,6 +934,10 @@ macro(nf_add_idf_as_library)
917934
PROPERTY COMPILE_DEFINITIONS ${IDF_LWIP_COMPILE_DEFINITIONS}
918935
)
919936

937+
#Enable Smartconfig
938+
set(ESP32_ENABLE_SMARTCONFIG "ON" CACHE INTERNAL "Enable support for Smartconfig")
939+
940+
920941
endif()
921942

922943
# need to add include path to find our ffconfig.h and target_platform.h
@@ -1035,7 +1056,7 @@ macro(nf_add_idf_as_library)
10351056
add_custom_command(
10361057
TARGET ${NANOCLR_PROJECT_NAME}.elf POST_BUILD
10371058
COMMAND ${output_idf_size}
1038-
--archives --target ${TARGET_SERIES_SHORT} ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.map
1059+
--archives ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.map
10391060
COMMENT "Ouptut IDF size summary")
10401061

10411062
endmacro()

‎CMake/xtensa-esp32c3.json‎ renamed to ‎CMake/riscv-esp32c3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
],
66
"configurePresets": [
77
{
8-
"name": "xtensa-esp32c3-preset",
8+
"name": "riscv-esp32c3-preset",
99
"description": "Preset for ESP32-C3 series",
1010
"inherits": "general-preset",
1111
"hidden": true,
1212
"cacheVariables": {
1313
"CMAKE_TOOLCHAIN_FILE": {
1414
"type": "FILEPATH",
15-
"value": "${sourceDir}/CMake/toolchain.riscv32-esp-elf.cmake"
15+
"value": "${sourceDir}/CMake/toolchain.riscv32-esp32c3-elf.cmake"
1616
},
1717
"NF_INTEROP_ASSEMBLIES": null,
1818
"NF_TARGET_HAS_NANOBOOTER": "OFF",

‎CMake/xtensa-esp32c6.json‎ renamed to ‎CMake/riscv-esp32c6.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
],
66
"configurePresets": [
77
{
8-
"name": "xtensa-esp32c6-preset",
8+
"name": "riscv-esp32c6-preset",
99
"description": "Preset for ESP32-C6 series",
1010
"inherits": "general-preset",
1111
"hidden": true,
1212
"cacheVariables": {
1313
"CMAKE_TOOLCHAIN_FILE": {
1414
"type": "FILEPATH",
15-
"value": "${sourceDir}/CMake/toolchain.riscv32-esp-elf.cmake"
15+
"value": "${sourceDir}/CMake/toolchain.riscv32-esp32c6-elf.cmake"
1616
},
1717
"NF_INTEROP_ASSEMBLIES": null,
1818
"NF_TARGET_HAS_NANOBOOTER": "OFF",
@@ -25,7 +25,7 @@
2525
"SUPPORT_ANY_BASE_CONVERSION": "ON",
2626
"API_System.Net": "ON",
2727
"API_System.Math": "ON",
28-
"API_System.Device.Adc": "ON",
28+
"API_System.Device.Adc": "OFF",
2929
"API_System.Device.Gpio": "ON",
3030
"API_System.Device.I2c": "ON",
3131
"API_System.Device.I2c.Slave": "ON",

‎CMake/xtensa-esp32h2.json‎ renamed to ‎CMake/riscv-esp32h2.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
],
66
"configurePresets": [
77
{
8-
"name": "xtensa-esp32h2-preset",
8+
"name": "riscv-esp32h2-preset",
99
"description": "Preset for ESP32-H2 series",
1010
"inherits": "general-preset",
1111
"hidden": true,
1212
"cacheVariables": {
1313
"CMAKE_TOOLCHAIN_FILE": {
1414
"type": "FILEPATH",
15-
"value": "${sourceDir}/CMake/toolchain.riscv32-esp-elf.cmake"
15+
"value": "${sourceDir}/CMake/toolchain.riscv32-esp32h2-elf.cmake"
1616
},
1717
"NF_INTEROP_ASSEMBLIES": null,
1818
"NF_TARGET_HAS_NANOBOOTER": "OFF",
@@ -25,7 +25,7 @@
2525
"SUPPORT_ANY_BASE_CONVERSION": "ON",
2626
"API_System.Net": "ON",
2727
"API_System.Math": "ON",
28-
"API_System.Device.Adc": "ON",
28+
"API_System.Device.Adc": "OFF",
2929
"API_System.Device.Gpio": "ON",
3030
"API_System.Device.I2c": "ON",
3131
"API_System.Device.I2c.Slave": "ON",

‎CMake/riscv-esp32p4.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"version": 4,
3+
"include": [
4+
"base.json"
5+
],
6+
"configurePresets": [
7+
{
8+
"name": "riscv-esp32p4-preset",
9+
"description": "Preset for ESP32-P4 series",
10+
"inherits": "general-preset",
11+
"hidden": true,
12+
"cacheVariables": {
13+
"CMAKE_TOOLCHAIN_FILE": {
14+
"type": "FILEPATH",
15+
"value": "${sourceDir}/CMake/toolchain.riscv32-esp32p4-elf.cmake"
16+
},
17+
"NF_INTEROP_ASSEMBLIES": null,
18+
"NF_TARGET_HAS_NANOBOOTER": "OFF",
19+
"RTOS": "ESP32",
20+
"TARGET_SERIES": "ESP32_P4",
21+
"TARGET_BOARD": "ESP32_P4",
22+
"NF_FEATURE_HAS_CONFIG_BLOCK": "ON",
23+
"NF_FEATURE_USE_LITTLEFS": "ON",
24+
"NF_FEATURE_HAS_ACCESSIBLE_STORAGE": "ON",
25+
"SUPPORT_ANY_BASE_CONVERSION": "ON",
26+
"API_System.Net": "ON",
27+
"API_System.Math": "ON",
28+
"API_System.Device.Adc": "ON",
29+
"API_System.Device.Gpio": "ON",
30+
"API_System.Device.I2c": "ON",
31+
"API_System.Device.I2c.Slave": "ON",
32+
"API_System.Device.I2s": "ON",
33+
"API_System.Device.Spi": "ON",
34+
"API_System.Device.Pwm": "ON",
35+
"API_System.IO.Ports": "ON",
36+
"API_System.IO.FileSystem": "ON",
37+
"API_nanoFramework.System.IO.Hashing": "ON",
38+
"API_nanoFramework.System.Security.Cryptography": "ON",
39+
"API_Hardware.Esp32": "ON",
40+
"API_nanoFramework.Hardware.Esp32.Rmt": "ON",
41+
"API_nanoFramework.ResourceManager": "ON",
42+
"API_nanoFramework.System.Collections": "ON",
43+
"API_nanoFramework.System.Text": "ON"
44+
}
45+
}
46+
]
47+
}

0 commit comments

Comments
 (0)