RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #16059 from aabadie/pr/make/esptool_qemu_fix

Browse Source 
make/esptool: fix FFLAGS inclusion order for qemu
This commit is contained in:
Alexandre Abadie 2021-02-22 14:19:42 +01:00 committed by GitHub
commit 24185611d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/esp32/Makefile.include
View File

@ -79,9 +79,3 @@ endif
ifneq (,$(filter cpp,$(FEATURES_USED)))
ARCHIVES += -lstdc++
endif
# additional flasher configuration for ESP32 QEMU
ifneq (,$(filter esp_qemu,$(USEMODULE)))
FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin &&
FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin
endif

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

@ -40,6 +40,10 @@ ifneq (,$(filter esp_qemu,$(USEMODULE)))
FFLAGS += head -c $$((0x10000)) |
FFLAGS += cat - $(FLASHFILE).bin tmp.bin |
FFLAGS += head -c $(FLASH_SIZE)MB > $(BINDIR)/$(CPU)flash.bin && rm tmp.bin;
ifeq (esp32,$(CPU_FAM))
FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin &&
FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin
endif
else
PROGRAMMER_SPEED ?= 460800
FLASHER = $(ESPTOOL)