riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "cpu/esp8266: update deprecated flash_size argument"

Browse Source 
This reverts commit 422644bd3a1d4247ae74253ca2fa50d7d59fbd1b.

The option is only supported after 2.6 which is currently not the
version given with 'esp' toolchain.
It was a bit too early to switch to the new version.
Version 2.7 also supports the old option with only a warning.
This commit is contained in:
Gaëtan Harter 2019-09-16 15:58:26 +02:00
parent 1dcf88efb2
commit 15ea073f64
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp8266/Makefile.include
View File

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