diff --git a/cpu/stm32w108/Makefile.stm32w108 b/cpu/stm32w108/Makefile.stm32w108 index 1f27653a1..494de3a31 100644 --- a/cpu/stm32w108/Makefile.stm32w108 +++ b/cpu/stm32w108/Makefile.stm32w108 @@ -163,13 +163,12 @@ endif - -FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/linux/stm32w_flasher +FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/stm32w_flasher # Check if we are running under Windows ifdef OS ifneq (,$(findstring Windows,$(OS))) - FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/win/stm32w_flasher + FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/stm32w_flasher.exe endif endif diff --git a/tools/stm32w/stm32w_flasher/linux/CompositeForSTM32W.bin b/tools/stm32w/stm32w_flasher/CompositeForSTM32W.bin similarity index 100% rename from tools/stm32w/stm32w_flasher/linux/CompositeForSTM32W.bin rename to tools/stm32w/stm32w_flasher/CompositeForSTM32W.bin diff --git a/tools/stm32w/stm32w_flasher/win/FTD2XX.dll b/tools/stm32w/stm32w_flasher/FTD2XX.dll similarity index 100% rename from tools/stm32w/stm32w_flasher/win/FTD2XX.dll rename to tools/stm32w/stm32w_flasher/FTD2XX.dll diff --git a/tools/stm32w/stm32w_flasher/win/JlinkARM.DLL b/tools/stm32w/stm32w_flasher/JlinkARM.DLL similarity index 100% rename from tools/stm32w/stm32w_flasher/win/JlinkARM.DLL rename to tools/stm32w/stm32w_flasher/JlinkARM.DLL diff --git a/tools/stm32w/stm32w_flasher/linux/README b/tools/stm32w/stm32w_flasher/README similarity index 100% rename from tools/stm32w/stm32w_flasher/linux/README rename to tools/stm32w/stm32w_flasher/README diff --git a/tools/stm32w/stm32w_flasher/win/_ctypes.pyd b/tools/stm32w/stm32w_flasher/_ctypes.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/_ctypes.pyd rename to tools/stm32w/stm32w_flasher/_ctypes.pyd diff --git a/tools/stm32w/stm32w_flasher/win/_socket.pyd b/tools/stm32w/stm32w_flasher/_socket.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/_socket.pyd rename to tools/stm32w/stm32w_flasher/_socket.pyd diff --git a/tools/stm32w/stm32w_flasher/win/_ssl.pyd b/tools/stm32w/stm32w_flasher/_ssl.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/_ssl.pyd rename to tools/stm32w/stm32w_flasher/_ssl.pyd diff --git a/tools/stm32w/stm32w_flasher/win/bz2.pyd b/tools/stm32w/stm32w_flasher/bz2.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/bz2.pyd rename to tools/stm32w/stm32w_flasher/bz2.pyd diff --git a/tools/stm32w/stm32w_flasher/win/d2xx._d2xx.pyd b/tools/stm32w/stm32w_flasher/d2xx._d2xx.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/d2xx._d2xx.pyd rename to tools/stm32w/stm32w_flasher/d2xx._d2xx.pyd diff --git a/tools/stm32w/stm32w_flasher/win/main_rfbl.s37 b/tools/stm32w/stm32w_flasher/main_rfbl.s37 similarity index 100% rename from tools/stm32w/stm32w_flasher/win/main_rfbl.s37 rename to tools/stm32w/stm32w_flasher/main_rfbl.s37 diff --git a/tools/stm32w/stm32w_flasher/win/pyexpat.pyd b/tools/stm32w/stm32w_flasher/pyexpat.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/pyexpat.pyd rename to tools/stm32w/stm32w_flasher/pyexpat.pyd diff --git a/tools/stm32w/stm32w_flasher/win/python26.dll b/tools/stm32w/stm32w_flasher/python26.dll similarity index 100% rename from tools/stm32w/stm32w_flasher/win/python26.dll rename to tools/stm32w/stm32w_flasher/python26.dll diff --git a/tools/stm32w/stm32w_flasher/win/pywintypes26.dll b/tools/stm32w/stm32w_flasher/pywintypes26.dll similarity index 100% rename from tools/stm32w/stm32w_flasher/win/pywintypes26.dll rename to tools/stm32w/stm32w_flasher/pywintypes26.dll diff --git a/tools/stm32w/stm32w_flasher/win/select.pyd b/tools/stm32w/stm32w_flasher/select.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/select.pyd rename to tools/stm32w/stm32w_flasher/select.pyd diff --git a/tools/stm32w/stm32w_flasher/linux/stm32w_flasher b/tools/stm32w/stm32w_flasher/stm32w_flasher similarity index 100% rename from tools/stm32w/stm32w_flasher/linux/stm32w_flasher rename to tools/stm32w/stm32w_flasher/stm32w_flasher diff --git a/tools/stm32w/stm32w_flasher/win/stm32w_flasher.exe b/tools/stm32w/stm32w_flasher/stm32w_flasher.exe similarity index 100% rename from tools/stm32w/stm32w_flasher/win/stm32w_flasher.exe rename to tools/stm32w/stm32w_flasher/stm32w_flasher.exe diff --git a/tools/stm32w/stm32w_flasher/win/unicodedata.pyd b/tools/stm32w/stm32w_flasher/unicodedata.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/unicodedata.pyd rename to tools/stm32w/stm32w_flasher/unicodedata.pyd diff --git a/tools/stm32w/stm32w_flasher/win/w9xpopen.exe b/tools/stm32w/stm32w_flasher/w9xpopen.exe similarity index 100% rename from tools/stm32w/stm32w_flasher/win/w9xpopen.exe rename to tools/stm32w/stm32w_flasher/w9xpopen.exe diff --git a/tools/stm32w/stm32w_flasher/win/CompositeForSTM32W.bin b/tools/stm32w/stm32w_flasher/win/CompositeForSTM32W.bin deleted file mode 100644 index 9548d9c26..000000000 Binary files a/tools/stm32w/stm32w_flasher/win/CompositeForSTM32W.bin and /dev/null differ diff --git a/tools/stm32w/stm32w_flasher/win/win32api.pyd b/tools/stm32w/stm32w_flasher/win32api.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/win32api.pyd rename to tools/stm32w/stm32w_flasher/win32api.pyd diff --git a/tools/stm32w/stm32w_flasher/win/win32pipe.pyd b/tools/stm32w/stm32w_flasher/win32pipe.pyd similarity index 100% rename from tools/stm32w/stm32w_flasher/win/win32pipe.pyd rename to tools/stm32w/stm32w_flasher/win32pipe.pyd