alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-04 08:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/idf_version' into 'master'

Browse Source 
build system: add IDF_VER environment variable and preprocessor define

This adds an `IDF_VER` preprocessor define which is obtained from `git describe`.

Looks like `v1.0-275-g0efaa4f` for non-release version or `v2.0` for a tagged (release) version.

See merge request !403
This commit is contained in:
Ivan Grokhotkov
2017-01-11 11:34:28 +08:00
parent 758281dfed 89e0ecc272
commit 8c26dd8d38
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader/src/main/bootloader_start.c
View File

@@ -242,7 +242,7 @@ void bootloader_main()
rtc_set_cpu_freq(CPU_80M);
uart_console_configure();
ESP_LOGI(TAG, "Espressif ESP32 2nd stage bootloader v. %s", BOOT_VERSION);
ESP_LOGI(TAG, "ESP-IDF %s 2nd stage bootloader", IDF_VER);
#if defined(CONFIG_SECURE_BOOT_ENABLED) || defined(CONFIG_FLASH_ENCRYPTION_ENABLED)
esp_err_t err;
#endif