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

make/esptool: fix FFLAGS inclusion order for qemu
RIOT-OS · Feb 22, 2021 · 2418561 · 2418561
2 parents bd7782c + 4307708
commit 2418561
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include
@@ -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
diff --git a/makefiles/tools/esptool.inc.mk b/makefiles/tools/esptool.inc.mk
@@ -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)