From cbbd02d5209b1a83daf7d7ee3080bb3c004c4c80 Mon Sep 17 00:00:00 2001
From: Gunar Schorcht <gunar@schorcht.net>
Date: Fri, 4 Mar 2022 08:34:19 +0100
Subject: [PATCH] dist/tools: rename esptool to esptools to use it for several
 tools

The directory `dist/tools/esptool` already contains a couple of ESP tools and not only esptool.py. As the location for a couple of ESP related tools, it is more clear to call it `esptools` instead of `esptool`.
---
 cpu/esp_common/Makefile.include                   | 4 ++--
 dist/tools/{esptool => esptools}/espreset.py      | 0
 dist/tools/{esptool => esptools}/esptool.py       | 0
 dist/tools/{esptool => esptools}/gen_esp32part.py | 0
 makefiles/tools/esptool.inc.mk                    | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename dist/tools/{esptool => esptools}/espreset.py (100%)
 rename dist/tools/{esptool => esptools}/esptool.py (100%)
 rename dist/tools/{esptool => esptools}/gen_esp32part.py (100%)

diff --git a/cpu/esp_common/Makefile.include b/cpu/esp_common/Makefile.include
index 81da7f73e209..e2ecff5721b9 100644
--- a/cpu/esp_common/Makefile.include
+++ b/cpu/esp_common/Makefile.include
@@ -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
diff --git a/dist/tools/esptool/espreset.py b/dist/tools/esptools/espreset.py
similarity index 100%
rename from dist/tools/esptool/espreset.py
rename to dist/tools/esptools/espreset.py
diff --git a/dist/tools/esptool/esptool.py b/dist/tools/esptools/esptool.py
similarity index 100%
rename from dist/tools/esptool/esptool.py
rename to dist/tools/esptools/esptool.py
diff --git a/dist/tools/esptool/gen_esp32part.py b/dist/tools/esptools/gen_esp32part.py
similarity index 100%
rename from dist/tools/esptool/gen_esp32part.py
rename to dist/tools/esptools/gen_esp32part.py
diff --git a/makefiles/tools/esptool.inc.mk b/makefiles/tools/esptool.inc.mk
index 4188590a03dd..1d30d2b151f7 100644
--- a/makefiles/tools/esptool.inc.mk
+++ b/makefiles/tools/esptool.inc.mk
@@ -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)