kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-18 11:03:50 +01:00
Code Releases Activity

makefile/tools/esptool: update to version 5.0.0

Browse Source
This commit is contained in:
Gunar Schorcht 2025-07-23 11:15:21 +02:00
parent 7813f3ebad
commit a36704e430
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/esp32/bootloader/Makefile
View File

@ -467,5 +467,5 @@ FLASH_SIZE ?= 2 # smallesrt size all ESP32x SoC support
# this second-stage bootloader image. # this second-stage bootloader image.
$(ESP_SDK_BOOTLOADER_BIN): esptool $(ESP_SDK_BOOTLOADER_ELF) $(ESP_SDK_BOOTLOADER_BIN): esptool $(ESP_SDK_BOOTLOADER_ELF)
$(Q)echo "Generating bootloader image $(ESP_SDK_BOOTLOADER_BIN)" $(Q)echo "Generating bootloader image $(ESP_SDK_BOOTLOADER_BIN)"
$(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash_mode $(FLASH_MODE) \ $(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash-mode $(FLASH_MODE) \
--flash_size $(FLASH_SIZE)MB --flash_freq $(FLASH_FREQ) -o $@ $(ESP_SDK_BOOTLOADER_ELF) --flash-size $(FLASH_SIZE)MB --flash-freq $(FLASH_FREQ) -o $@ $(ESP_SDK_BOOTLOADER_ELF)

4
cpu/esp_common/Makefile.include
View File

@ -140,8 +140,8 @@ FLASHFILE ?= $(ELFFILE).bin
# This is the binary that ends up programmed in the flash. # This is the binary that ends up programmed in the flash.
$(ELFFILE).bin: $(ELFFILE) $(ELFFILE).bin: $(ELFFILE)
$(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash_mode $(FLASH_MODE) \ $(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash-mode $(FLASH_MODE) \
--flash_size $(FLASH_SIZE)MB --flash_freq $(FLASH_FREQ) $(FLASH_OPTS) \ --flash-size $(FLASH_SIZE)MB --flash-freq $(FLASH_FREQ) $(FLASH_OPTS) \
-o $@ $< -o $@ $<
# Convert .elf and .csv to .bin files at build time, but make them available for # Convert .elf and .csv to .bin files at build time, but make them available for

18
makefiles/tools/esptool.inc.mk
View File

@ -1,6 +1,6 @@
ESPTOOL_VERSION = 4.9.0 ESPTOOL_VERSION = 5.0.0
ESPTOOL_VENV = $(RIOTTOOLS)/esptools/venv ESPTOOL_VENV = $(RIOTTOOLS)/esptools/venv
ESPTOOL = $(ESPTOOL_VENV)/bin/esptool.py ESPTOOL = $(ESPTOOL_VENV)/bin/esptool
# ESP-IDF uses dio as flash mode for esptool.py when qout or qio mode are # ESP-IDF uses dio as flash mode for esptool.py when qout or qio mode are
# configured to always boot in dual SPI mode # configured to always boot in dual SPI mode
@ -17,9 +17,9 @@ else
PROGRAMMER_SPEED ?= 460800 PROGRAMMER_SPEED ?= 460800
FLASHER = $(ESPTOOL) FLASHER = $(ESPTOOL)
FFLAGS += --chip $(FLASH_CHIP) --port $(PROG_DEV) --baud $(PROGRAMMER_SPEED) FFLAGS += --chip $(FLASH_CHIP) --port $(PROG_DEV) --baud $(PROGRAMMER_SPEED)
FFLAGS += --before default_reset write_flash -z FFLAGS += --before default-reset write-flash -z
FFLAGS += --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) FFLAGS += --flash-mode $(FLASH_MODE) --flash-freq $(FLASH_FREQ)
FFLAGS += --flash_size detect FFLAGS += --flash-size detect
FFLAGS += $(BOOTLOADER_POS) $(BOOTLOADER_BIN) FFLAGS += $(BOOTLOADER_POS) $(BOOTLOADER_BIN)
FFLAGS += 0x8000 $(BINDIR)/partitions.bin FFLAGS += 0x8000 $(BINDIR)/partitions.bin
FFLAGS += $(FLASHFILE_POS) $(FLASHFILE) FFLAGS += $(FLASHFILE_POS) $(FLASHFILE)
@ -33,14 +33,14 @@ all: esptool
esp-qemu: $(FLASHFILE) esp-qemu: $(FLASHFILE)
ifeq (esp32,$(CPU)) ifeq (esp32,$(CPU))
$(Q)echo \ $(Q)echo \
"--flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) " \ "--flash-mode $(FLASH_MODE) --flash-freq $(FLASH_FREQ) " \
"--flash_size $(FLASH_SIZE)MB" \ "--flash-size $(FLASH_SIZE)MB" \
"$(BOOTLOADER_POS) $(BOOTLOADER_BIN)" \ "$(BOOTLOADER_POS) $(BOOTLOADER_BIN)" \
"0x8000 $(BINDIR)/partitions.bin" \ "0x8000 $(BINDIR)/partitions.bin" \
"$(FLASHFILE_POS) $(FLASHFILE)" > $(BINDIR)/qemu_flash_args "$(FLASHFILE_POS) $(FLASHFILE)" > $(BINDIR)/qemu_flash_args
$(Q)$(ESPTOOL) \ $(Q)$(ESPTOOL) \
--chip $(CPU_FAM) merge_bin \ --chip $(CPU_FAM) merge-bin \
--fill_flash_size 4MB \ --pad-to-size 4MB \
-o $(BINDIR)/qemu_flash_image.bin @$(BINDIR)/qemu_flash_args -o $(BINDIR)/qemu_flash_image.bin @$(BINDIR)/qemu_flash_args
$(Q)cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin $(Q)cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin
$(Q)cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin $(Q)cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin

4
pkg/esp8266_sdk/bootloader/Makefile
View File

@ -110,6 +110,6 @@ FLASH_SIZE ?= 4
# this second-stage bootloader image. # this second-stage bootloader image.
$(ESP_SDK_BOOTLOADER_BIN): esptool $(ESP_SDK_BOOTLOADER_ELF) $(ESP_SDK_BOOTLOADER_BIN): esptool $(ESP_SDK_BOOTLOADER_ELF)
$(Q)echo "Generating bootloader image $(ESP_SDK_BOOTLOADER_BIN)" $(Q)echo "Generating bootloader image $(ESP_SDK_BOOTLOADER_BIN)"
$(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash_mode $(FLASH_MODE) \ $(Q)$(ESPTOOL) --chip $(FLASH_CHIP) elf2image --flash-mode $(FLASH_MODE) \
--flash_size $(FLASH_SIZE)MB --flash_freq $(FLASH_FREQ) -o $@ $(ESP_SDK_BOOTLOADER_ELF) --flash-size $(FLASH_SIZE)MB --flash-freq $(FLASH_FREQ) -o $@ $(ESP_SDK_BOOTLOADER_ELF)
$(Q)mv $(@)0x00000.bin $@ $(Q)mv $(@)0x00000.bin $@