Skip to content

Commit 554f529

Browse files
committed
Per review notes, make esp_lcd and esp32-camera unconditional
1 parent 80a1d1a commit 554f529

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

ports/espressif/CMakeLists.txt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,9 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
66

77
# The component list here determines what options we get in menuconfig and what the ninja file
88
# can build.
9-
set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip ulp wpa_supplicant freertos bt usb)
9+
set(COMPONENTS esptool_py soc driver log main esp-tls mbedtls mdns esp_event esp_adc_cal esp_netif esp_wifi lwip ulp wpa_supplicant freertos bt usb esp32-camera esp_lcd)
1010

11-
if("${CIRCUITPY_ESPCAMERA}")
12-
message("Including esp32-camera")
13-
set(EXTRA_COMPONENT_DIRS "esp32-camera")
14-
list(APPEND COMPONENTS "esp32-camera")
15-
endif()
16-
17-
if("${CIRCUITPY_DOTCLOCKFRAMEBUFFER}")
18-
message("Including esp32-camera")
19-
list(APPEND COMPONENTS "esp_lcd")
20-
endif()
11+
list(APPEND EXTRA_COMPONENT_DIRS "esp32-camera")
2112

2213
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
2314
project(circuitpython)

ports/espressif/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ endif
360360
do-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
361361
QSTR_GLOBAL_REQUIREMENTS += $(BUILD)/esp-idf/config/sdkconfig.h
362362
$(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig CMakeLists.txt | $(BUILD)/esp-idf
363-
IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja -DCIRCUITPY_ESPCAMERA=$(CIRCUITPY_ESPCAMERA) -DCIRCUITPY_DOTCLOCKFRAMEBUFFER=$(CIRCUITPY_DOTCLOCKFRAMEBUFFER)
363+
IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja
364364

365365
# build a lib
366366
# Adding -d explain -j 1 -v to the ninja line will output debug info

0 commit comments

Comments
 (0)