Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dist/tools: rename directory esptool to esptools to use it for multiple tools #17742

Merged
merged 1 commit into from
Mar 4, 2022
Merged

dist/tools: rename directory esptool to esptools to use it for multiple tools #17742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpu/esp_common/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ PROGRAMMERS_SUPPORTED += esptool
ELFFILE ?= $(BINDIR)/$(APPLICATION).elf
FLASHFILE ?= $(ELFFILE).bin

ESPTOOL ?= $(RIOTTOOLS)/esptool/esptool.py
ESPTOOL ?= $(RIOTTOOLS)/esptools/esptool.py

# This is the binary that ends up programmed in the flash.
$(ELFFILE).bin: $(ELFFILE)
Expand All @@ -147,7 +147,7 @@ $(BINDIR)/partitions.csv: $(FLASHFILE)
$(Q)ls -l $< | awk '{ print $$5 }' >> $@

$(BINDIR)/partitions.bin: $(PARTITION_TABLE_CSV)
$(Q)python3 $(RIOTTOOLS)/esptool/gen_esp32part.py --verify $< $@
$(Q)python3 $(RIOTTOOLS)/esptools/gen_esp32part.py --verify $< $@

# Convert .elf and .csv to .bin files at build time, but make them available for
# tests at flash time. These can't be added to FLASHDEPS because they depend on
Expand Down
0 dist/tools/esptool/espreset.py → dist/tools/esptools/espreset.py
View file
Open in desktop
File renamed without changes.
0 dist/tools/esptool/esptool.py → dist/tools/esptools/esptool.py
View file
Open in desktop
File renamed without changes.
0 dist/tools/esptool/gen_esp32part.py → dist/tools/esptools/gen_esp32part.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions makefiles/tools/esptool.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ endif

BOOTLOADER_BIN = bootloader$(BOOTLOADER_COLOR)$(BOOTLOADER_INFO).bin

ESPTOOL ?= $(RIOTTOOLS)/esptool/esptool.py
ESPTOOL ?= $(RIOTTOOLS)/esptools/esptool.py

# flasher configuration
ifneq (,$(filter esp_qemu,$(USEMODULE)))
Expand Down Expand Up @@ -43,5 +43,5 @@ ifeq (esp32,$(CPU_FAM))
endif

# reset tool configuration
RESET ?= $(RIOTTOOLS)/esptool/espreset.py
RESET ?= $(RIOTTOOLS)/esptools/espreset.py
RESET_FLAGS ?= --port $(PROG_DEV)