File tree Expand file tree Collapse file tree 3 files changed +4
-6
lines changed Expand file tree Collapse file tree 3 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -352,7 +352,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
352
352
OBJ += $(addprefix $(BUILD ) /, $(SRC_S:.s=.o ) )
353
353
OBJ += $(addprefix $(BUILD ) /, $(SRC_MOD:.c=.o ) )
354
354
355
- SRC_QSTR += $(HEADER_BUILD ) /sdiodata.h
355
+ QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD ) /sdiodata.h
356
356
OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD ) /sioddata.h
357
357
$(HEADER_BUILD ) /sdiodata.h : tools/mksdiodata.py | $(HEADER_BUILD )
358
358
$(Q )$(PYTHON ) $< > $@
Original file line number Diff line number Diff line change @@ -353,7 +353,7 @@ endif
353
353
# create the config headers
354
354
.PHONY : do-sdkconfig
355
355
do-sdkconfig : $(BUILD ) /esp-idf/config/sdkconfig.h
356
- $( BUILD ) /genhdr/qstr.i.last : $(BUILD ) /esp-idf/config/sdkconfig.h
356
+ QSTR_GLOBAL_REQUIREMENTS += $(BUILD ) /esp-idf/config/sdkconfig.h
357
357
$(BUILD ) /esp-idf/config/sdkconfig.h : boards/$(BOARD ) /sdkconfig CMakeLists.txt | $(BUILD ) /esp-idf
358
358
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 )
359
359
@@ -378,9 +378,6 @@ menuconfig: $(BUILD)/esp-idf/config $(BUILD)/esp-idf/config/sdkconfig.h
378
378
# We should use that when available. For now, we sort out everything.
379
379
python tools/update_sdkconfig.py --board=$(BOARD ) --debug=$(DEBUG )
380
380
381
- # qstr builds include headers so we need to make sure they are up to date
382
- $(HEADER_BUILD ) /qstr.split : | $(BUILD ) /esp-idf/config/sdkconfig.h
383
-
384
381
BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a libsmartconfig.a libwapi.a
385
382
BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET ) /libphy.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET ) /, $(BINARY_WIFI_BLOBS ) )
386
383
ifeq ($(IDF_TARGET ) ,esp32)
Original file line number Diff line number Diff line change @@ -424,7 +424,8 @@ $(BUILD)/stage2.c: stage2.c.jinja gen_stage2.py | $(BUILD)/
424
424
$(STEPECHO ) " GEN $<"
425
425
$(Q )$(PYTHON ) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES )
426
426
427
- $(HEADER_BUILD ) /flash_info.h : flash_info.h.jinja gen_stage2.py | $(HEADER_BUILD ) /
427
+ QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD ) /flash_info.h
428
+ $(HEADER_BUILD ) /flash_info.h : flash_info.h.jinja gen_stage2.py
428
429
$(STEPECHO ) " GEN $<"
429
430
$(Q )$(PYTHON ) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES )
430
431
You can’t perform that action at this time.
0 commit comments