From a282fefb0d653113de1cb880e378522011f6c563 Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Fri, 29 Mar 2024 06:35:05 +1100 Subject: [PATCH] esp32/Makefile: Only set port & baud for jobs that access hardware. In idf v5.2.1 if the port flag is set it's validated even on jobs that don't access hardware like clean. This causes the job to fail if device isn't connected. Signed-off-by: Andrew Leech --- ports/esp32/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index 3df2af4716..d79adf7772 100644 --- a/ports/esp32/Makefile +++ b/ports/esp32/Makefile @@ -43,6 +43,7 @@ ifdef USER_C_MODULES endif IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR="$(abspath $(BOARD_DIR))" $(CMAKE_ARGS) +DEVICE += -p $(PORT) -b $(BAUD) ifdef FROZEN_MANIFEST IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST) @@ -59,7 +60,7 @@ endif HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m" define RUN_IDF_PY - idf.py $(IDFPY_FLAGS) -B $(BUILD) -p $(PORT) -b $(BAUD) $(1) + idf.py $(IDFPY_FLAGS) -B $(BUILD) $(1) endef all: @@ -78,13 +79,13 @@ clean: $(call RUN_IDF_PY,fullclean) deploy: - $(call RUN_IDF_PY,flash) + $(call RUN_IDF_PY,$(DEVICE) flash) erase: - $(call RUN_IDF_PY,erase-flash) + $(call RUN_IDF_PY,$(DEVICE) erase-flash) monitor: - $(call RUN_IDF_PY,monitor) + $(call RUN_IDF_PY,$(DEVICE) monitor) size: $(call RUN_IDF_PY,size)