Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

esp*: updates to the programmer configuration #11646

Merged
merged 4 commits into from
Sep 10, 2019
Merged

esp*: updates to the programmer configuration #11646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d8de6b
boards/esp*: update RESET and RESET_FLAGS
cladmi Jun 5, 2019
4a08527
boards/esp*: use PORT in RESET_FLAGS
cladmi Jun 5, 2019
90a9adb
cpu/esp*: append to FLASHDEPS
cladmi Jun 5, 2019
422644b
cpu/esp8266: update deprecated flash_size argument
cladmi Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion boards/common/esp32/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

3 changes: 2 additions & 1 deletion boards/common/esp8266/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion cpu/esp32/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,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)
Expand Down
4 changes: 2 additions & 2 deletions cpu/esp8266/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ LINKFLAGS += -Wl,--warn-unresolved-symbols
FLASHFILE ?= $(ELFFILE)

# configure preflasher to convert .elf to .bin before flashing
FLASH_SIZE = -fs 8m
FLASH_SIZE = -fs 1MB
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to avoid the warning.

PREFLASHER ?= esptool.py
PREFFLAGS ?= elf2image $(FLASH_SIZE) $(FLASHFILE)
FLASHDEPS ?= preflash
FLASHDEPS += preflash

# flasher configuration
ifeq ($(QEMU), 1)
Expand Down