Skip to content

Commit 0ad9dbf

Browse files
MATTYGILOMATTYGILO
committed
Merge remote-tracking branch 'origin/main'
2 parents f501789 + debcfab commit 0ad9dbf

File tree

30 files changed

+179
-48
lines changed

30 files changed

+179
-48
lines changed

‎boards/MICROLITE/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ endforeach()
2727
configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
2828
set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
2929

30+
set(ENV{IDF_COMPONENT_MANAGER} "1")
31+
3032
# Include main IDF cmake file and define the project.
3133
set(ENV{IDF_COMPONENT_MANAGER} "1")
3234
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
33-
project(micropython)
35+
project(micropython)

‎boards/MICROLITE/main/CMakeLists.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,7 @@ message(STATUS "microlite/main/cmake: CURRENT_DIR=${CURRENT_DIR}")
55

66
get_filename_component(MICROPY_DIR "../../../third_party/micropython" ABSOLUTE)
77

8-
98
message (STATUS "microlite/main/cmake: MICROPY_DIR=${MICROPY_DIR}")
109

1110
set(PROJECT_DIR ${MICROPY_DIR}/ports/esp32)
12-
13-
# ——————————————————————————————————————————————————————————————
14-
# Ensure ESP-Ethernet is built alongside the other IDF components
15-
# ——————————————————————————————————————————————————————————————
16-
list(APPEND IDF_COMPONENTS "esp_eth")
17-
message(STATUS "microlite/main/cmake: IDF_COMPONENTS=${IDF_COMPONENTS}")
18-
19-
# Now include the MicroPython ESP32 build
2011
include(${PROJECT_DIR}/main/CMakeLists.txt)
21-
22-
message(STATUS "microlite/main/cmake: After IDF_COMPONENTS=${IDF_COMPONENTS}")

‎boards/MICROLITE/main/idf_component.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## IDF Component Manager Manifest File
2+
dependencies:
3+
espressif/mdns: "~1.1.0"
4+
espressif/esp_tinyusb:
5+
rules:
6+
- if: "target in [esp32s2, esp32s3]"
7+
version: "~1.0.0"
8+
espressif/lan867x:
9+
version: "~1.0.0"
10+
rules:
11+
- if: "target == esp32"
12+
- if: "idf_version >=5.3"
13+
idf:
14+
version: ">=5.2.0"

‎boards/MICROLITE_C3/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ endforeach()
2727
configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
2828
set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
2929

30+
set(ENV{IDF_COMPONENT_MANAGER} "1")
31+
3032
# Include main IDF cmake file and define the project.
3133
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
32-
project(micropython)
34+
project(micropython)

‎boards/MICROLITE_C3/main/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# Include MicroPython ESP32 component.
22

33
get_filename_component(CURRENT_DIR "." ABSOLUTE)
4-
54
message(STATUS "microlite/main/cmake: CURRENT_DIR=${CURRENT_DIR}")
65

76
get_filename_component(MICROPY_DIR "../../../third_party/micropython" ABSOLUTE)
87

9-
108
message (STATUS "microlite/main/cmake: MICROPY_DIR=${MICROPY_DIR}")
119

1210
set(PROJECT_DIR ${MICROPY_DIR}/ports/esp32)
13-
include(${PROJECT_DIR}/main/CMakeLists.txt)
11+
include(${PROJECT_DIR}/main/CMakeLists.txt)

‎boards/MICROLITE_C3/main/idf_component.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## IDF Component Manager Manifest File
2+
dependencies:
3+
espressif/mdns: "~1.1.0"
4+
espressif/esp_tinyusb:
5+
rules:
6+
- if: "target in [esp32s2, esp32s3]"
7+
version: "~1.0.0"
8+
espressif/lan867x:
9+
version: "~1.0.0"
10+
rules:
11+
- if: "target == esp32"
12+
- if: "idf_version >=5.3"
13+
idf:
14+
version: ">=5.2.0"

‎boards/MICROLITE_C3_USB/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ endforeach()
2727
configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
2828
set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
2929

30+
set(ENV{IDF_COMPONENT_MANAGER} "1")
31+
3032
# Include main IDF cmake file and define the project.
3133
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
32-
project(micropython)
34+
project(micropython)

‎boards/MICROLITE_C3_USB/main/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# Include MicroPython ESP32 component.
22

33
get_filename_component(CURRENT_DIR "." ABSOLUTE)
4-
54
message(STATUS "microlite/main/cmake: CURRENT_DIR=${CURRENT_DIR}")
65

76
get_filename_component(MICROPY_DIR "../../../third_party/micropython" ABSOLUTE)
87

9-
108
message (STATUS "microlite/main/cmake: MICROPY_DIR=${MICROPY_DIR}")
119

1210
set(PROJECT_DIR ${MICROPY_DIR}/ports/esp32)
13-
include(${PROJECT_DIR}/main/CMakeLists.txt)
11+
include(${PROJECT_DIR}/main/CMakeLists.txt)

‎boards/MICROLITE_C3_USB/main/idf_component.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## IDF Component Manager Manifest File
2+
dependencies:
3+
espressif/mdns: "~1.1.0"
4+
espressif/esp_tinyusb:
5+
rules:
6+
- if: "target in [esp32s2, esp32s3]"
7+
version: "~1.0.0"
8+
espressif/lan867x:
9+
version: "~1.0.0"
10+
rules:
11+
- if: "target == esp32"
12+
- if: "idf_version >=5.3"
13+
idf:
14+
version: ">=5.2.0"

‎boards/MICROLITE_S2_SPIRAM/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ endforeach()
2727
configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
2828
set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
2929

30+
set(ENV{IDF_COMPONENT_MANAGER} "1")
31+
3032
# Include main IDF cmake file and define the project.
3133
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
32-
project(micropython)
34+
project(micropython)

0 commit comments

Comments
 (0)