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

Merge pull request #12896 from gschorcht/cpu/esp8266/esp_log_startup

Browse Source 
cpu/esp8266: startup info if module esp_log_startup is used
This commit is contained in:
benpicco 2019-12-07 17:13:37 +01:00 committed by GitHub
commit f2dbd3ba4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cpu/esp8266/Makefile.include
View File

@ -54,6 +54,14 @@ ifneq (, $(filter littlefs, $(USEMODULE)))
export RIOT_TEST_TIMEOUT = 200 export RIOT_TEST_TIMEOUT = 200
endif endif
ifneq (,$(filter log_color,$(USEMODULE)))
USEMODULE += esp_log_colored
endif
ifneq (,$(filter 4 5,$(LOG_LEVEL)))
USEMODULE += esp_log_startup
endif
# regular Makefile # regular Makefile
export TARGET_ARCH ?= xtensa-esp8266-elf export TARGET_ARCH ?= xtensa-esp8266-elf
@ -62,6 +70,7 @@ export TARGET_ARCH ?= xtensa-esp8266-elf
PSEUDOMODULES += esp_gdb PSEUDOMODULES += esp_gdb
PSEUDOMODULES += esp_log_colored PSEUDOMODULES += esp_log_colored
PSEUDOMODULES += esp_log_tagged PSEUDOMODULES += esp_log_tagged
PSEUDOMODULES += esp_log_startup
PSEUDOMODULES += esp_qemu PSEUDOMODULES += esp_qemu
PSEUDOMODULES += esp_sw_timer PSEUDOMODULES += esp_sw_timer
PSEUDOMODULES += esp_spiffs PSEUDOMODULES += esp_spiffs
@ -204,16 +213,20 @@ PREFFLAGS += ls -l $(FLASHFILE).bin | awk '{ print $$5 }' >> $(BINDIR)/partition
PREFFLAGS += python $(RIOTCPU)/$(CPU)/vendor/esp-idf/partition_table/gen_esp32part.py PREFFLAGS += python $(RIOTCPU)/$(CPU)/vendor/esp-idf/partition_table/gen_esp32part.py
PREFFLAGS += --verify $(BINDIR)/partitions.csv $(BINDIR)/partitions.bin PREFFLAGS += --verify $(BINDIR)/partitions.csv $(BINDIR)/partitions.bin
ifneq (, $(filter esp_log_colored, $(USEMODULE))) ifneq (,$(filter esp_log_colored,$(USEMODULE)))
BOOTLOADER ?= bootloader_dout_115200_color.bin BOOTLOADER_COLOR = _colors
else
BOOTLOADER ?= bootloader_dout_115200_no_color.bin
endif endif
ifneq (,$(filter esp_log_startup,$(USEMODULE)))
BOOTLOADER_INFO = _info
endif
BOOTLOADER_BIN = bootloader$(BOOTLOADER_COLOR)$(BOOTLOADER_INFO).bin
ifneq (, $(filter esp_qemu, $(USEMODULE))) ifneq (, $(filter esp_qemu, $(USEMODULE)))
FLASHER = dd FLASHER = dd
FFLAGS += if=/dev/zero bs=1M count=1 | tr "\\000" "\\377" > tmp.bin && FFLAGS += if=/dev/zero bs=1M count=1 | tr "\\000" "\\377" > tmp.bin &&
FFLAGS += cat $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER) tmp.bin | FFLAGS += cat $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER_BIN) tmp.bin |
FFLAGS += head -c $$((0x8000)) | FFLAGS += head -c $$((0x8000)) |
FFLAGS += cat - $(BINDIR)/partitions.bin tmp.bin | FFLAGS += cat - $(BINDIR)/partitions.bin tmp.bin |
FFLAGS += head -c $$((0x10000)) | FFLAGS += head -c $$((0x10000)) |
@ -228,7 +241,7 @@ else
FFLAGS += --before default_reset write_flash -z FFLAGS += --before default_reset write_flash -z
FFLAGS += --flash_size detect FFLAGS += --flash_size detect
FFLAGS += --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) FFLAGS += --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ)
FFLAGS += 0x0000 $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER) FFLAGS += 0x0000 $(RIOTCPU)/$(CPU)/bin/$(BOOTLOADER_BIN)
FFLAGS += 0x8000 $(BINDIR)/partitions.bin FFLAGS += 0x8000 $(BINDIR)/partitions.bin
FFLAGS += 0x10000 $(FLASHFILE).bin FFLAGS += 0x10000 $(FLASHFILE).bin
endif endif

BIN
cpu/esp8266/bin/bootloader.bin Normal file
View File

Binary file not shown.

BIN
cpu/esp8266/bin/bootloader_colors.bin Normal file
View File

Binary file not shown.

0
cpu/esp8266/bin/bootloader_dout_115200_color.bin → cpu/esp8266/bin/bootloader_colors_info.bin
View File

0
cpu/esp8266/bin/bootloader_dout_115200_no_color.bin → cpu/esp8266/bin/bootloader_info.bin
View File

4
cpu/esp8266/periph/flash.c
View File

@ -183,8 +183,8 @@ void spi_flash_drive_init (void)
_flash_end = _flashchip->chip_size - 5 * _flashchip->sector_size; _flash_end = _flashchip->chip_size - 5 * _flashchip->sector_size;
_flash_size = _flash_end - _flash_beg; /* MUST be at least 3 sectors (0x3000) */ _flash_size = _flash_end - _flash_beg; /* MUST be at least 3 sectors (0x3000) */
LOG_TAG_INFO("spi_flash", "MTD in SPI flash starts at address 0x%08x " LOG_TAG_DEBUG("spi_flash", "MTD in SPI flash starts at address 0x%08x "
"with a size of %d kbytes\n", _flash_beg, _flash_size >> 10); "with a size of %d kbytes\n", _flash_beg, _flash_size >> 10);
_flash_dev.driver = &_flash_driver; _flash_dev.driver = &_flash_driver;
_flash_dev.sector_count = _flash_size / _flashchip->sector_size; _flash_dev.sector_count = _flash_size / _flashchip->sector_size;

4
cpu/esp8266/startup.c
View File

@ -67,12 +67,14 @@ void esp_riot_init(void)
} }
ets_printf("\n"); ets_printf("\n");
#ifdef MODULE_ESP_LOG_STARTUP
ets_printf("Starting ESP8266 CPU with ID: %08x\n", system_get_chip_id()); ets_printf("Starting ESP8266 CPU with ID: %08x\n", system_get_chip_id());
ets_printf("ESP8266-RTOS-SDK Version %s\n\n", system_get_sdk_version()); ets_printf("ESP8266-RTOS-SDK Version %s\n\n", system_get_sdk_version());
ets_printf("CPU clock frequency: %d MHz\n", system_get_cpu_freq()); ets_printf("CPU clock frequency: %d MHz\n", system_get_cpu_freq());
extern void heap_stats(void); extern void heap_stats(void);
heap_stats(); heap_stats();
ets_printf("\n"); ets_printf("\n");
#endif
/* set exception handlers */ /* set exception handlers */
init_exceptions (); init_exceptions ();
@ -102,8 +104,10 @@ void esp_riot_init(void)
/* trigger board initialization */ /* trigger board initialization */
board_init(); board_init();
#ifdef MODULE_ESP_LOG_STARTUP
/* print the board config */ /* print the board config */
board_print_config(); board_print_config();
#endif
/* initialize ESP system event loop */ /* initialize ESP system event loop */
extern void esp_event_handler_init(void); extern void esp_event_handler_init(void);