1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00

cpu/esp32: bootloader versions with and w/o colors

For the implementation of the colored log output, two versions of the bootloader are introduced, one version with colored log output and one version without colors.
This commit is contained in:
Gunar Schorcht 2019-08-20 16:00:03 +02:00
parent 5a705762ee
commit f2f07252fe
4 changed files with 8 additions and 2 deletions

View File

@ -134,6 +134,12 @@ ifeq ($(QEMU), 1)
CFLAGS += -DQEMU
endif
ifneq (,$(filter esp_log_color,$(USEMODULE)))
BOOTLOADER_BIN = bootloader_with_colors.bin
else
BOOTLOADER_BIN = bootloader_without_colors.bin
endif
# LINKFLAGS += -Wl,--verbose
LINKFLAGS += -L$(ESP32_SDK_DIR)/components/esp32
@ -185,7 +191,7 @@ ifeq ($(QEMU), 1)
FLASHER = dd
FFLAGS += if=/dev/zero bs=1M count=4 | tr "\\000" "\\377" > tmp.bin && cat tmp.bin |
FFLAGS += head -c $$((0x1000)) |
FFLAGS += cat - $(RIOTCPU)/$(CPU)/bin/bootloader.bin tmp.bin |
FFLAGS += cat - $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER_BIN) tmp.bin |
FFLAGS += head -c $$((0x8000)) |
FFLAGS += cat - $(BINDIR)/partitions.bin tmp.bin |
FFLAGS += head -c $$((0x10000)) |
@ -199,7 +205,7 @@ else
FFLAGS += --chip esp32 -p $(PROG_DEV) -b $(PROGRAMMER_SPEED)
FFLAGS += --before default_reset --after hard_reset write_flash
FFLAGS += -z -fm $(FLASH_MODE) -fs detect -ff $(FLASH_FREQ)
FFLAGS += 0x1000 $(RIOTCPU)/$(CPU)/bin/bootloader.bin
FFLAGS += 0x1000 $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER_BIN)
FFLAGS += 0x8000 $(BINDIR)/partitions.bin
FFLAGS += 0x10000 $(FLASHFILE).bin
endif

Binary file not shown.

Binary file not shown.