1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #17742 from gschorcht/cpu/esp/rename_esptool_dir

dist/tools: rename directory esptool to esptools to use it for multiple tools
This commit is contained in:
Leandro Lanzieri 2022-03-04 11:58:40 +01:00 committed by GitHub
commit c33cfdfaec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions

View File

@ -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)
@ -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

View File

@ -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)))
@ -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)