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

Merge pull request #11646 from cladmi/pr/esp/programmer_update

Browse Source 
esp*: updates to the programmer configuration
This commit is contained in:
Juan I Carrano 2019-09-10 17:58:20 +02:00 committed by GitHub
commit c50d8fada1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/common/esp32/Makefile.include
View File

@ -8,4 +8,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
include $(RIOTMAKE)/tools/serial.inc.mk
# reset tool configuration
RESET ?= esptool.py --before default_reset run
RESET ?= esptool.py
RESET_FLAGS ?= --port $(PORT) --before default_reset run

3
boards/common/esp8266/Makefile.include
View File

@ -8,4 +8,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
include $(RIOTMAKE)/tools/serial.inc.mk
# reset tool configuration
RESET ?= esptool.py --before default_reset run
RESET ?= esptool.py
RESET_FLAGS ?= --port $(PORT) --before default_reset run

2
cpu/esp32/Makefile.include
View File

@ -175,7 +175,7 @@ PREFFLAGS += ls -l $(FLASHFILE).bin | awk '{ print $$5 }' >> $(BINDIR)/partition
PREFFLAGS += python $(RIOTCPU)/$(CPU)/gen_esp32part.py --disable-sha256sum
PREFFLAGS += --verify $(BINDIR)/partitions.csv $(BINDIR)/partitions.bin
FLASHDEPS = preflash
FLASHDEPS += preflash
# flasher configuration
ifeq ($(QEMU), 1)

4
cpu/esp8266/Makefile.include
View File

@ -141,10 +141,10 @@ LINKFLAGS += -nostdlib -lgcc -u ets_run -Wl,-gc-sections # -Wl,--print-gc-sectio
FLASHFILE ?= $(ELFFILE)
# configure preflasher to convert .elf to .bin before flashing
FLASH_SIZE = -fs 8m
FLASH_SIZE = -fs 1MB
PREFLASHER ?= esptool.py
PREFFLAGS ?= elf2image $(FLASH_SIZE) $(FLASHFILE)
FLASHDEPS ?= preflash
FLASHDEPS += preflash
# flasher configuration
ifeq ($(QEMU), 1)