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

Merge branch 'feature/fpga_warnings' into 'master'

Browse Source 
esp_system: Add boot warning when running on FPGA, fix dropped log issue

Closes IDF-2687

See merge request espressif/esp-idf!12209
This commit is contained in:
Angus Gratton
2021-02-02 09:02:23 +08:00
parent 458308786b dfda84c2ab
commit 2b5cbcf852
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_common/src/fpga_overrides.c
View File

@@ -13,17 +13,25 @@
// limitations under the License. // limitations under the License.
#include "sdkconfig.h" #include "sdkconfig.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/system_reg.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include "esp_log.h"
#include "esp_rom_sys.h" #include "esp_rom_sys.h"
#include "esp_rom_uart.h" #include "esp_rom_uart.h"
#include "esp_attr.h" #include "esp_attr.h"
static const char *TAG = "fpga";
extern void ets_update_cpu_frequency(uint32_t ticks_per_us); extern void ets_update_cpu_frequency(uint32_t ticks_per_us);
static void s_warn(void)
{
ESP_EARLY_LOGW(TAG, "Project configuration is for internal FPGA use, not all functions will work");
}
void bootloader_clock_configure(void) void bootloader_clock_configure(void)
{ {
s_warn();
esp_rom_uart_tx_wait_idle(0); esp_rom_uart_tx_wait_idle(0);
uint32_t xtal_freq_mhz = 40; uint32_t xtal_freq_mhz = 40;
@@ -48,7 +56,7 @@ void IRAM_ATTR bootloader_fill_random(void *buffer, size_t length)
void esp_clk_init(void) void esp_clk_init(void)
{ {
s_warn();
} }
void esp_perip_clk_init(void) void esp_perip_clk_init(void)

1
components/esp_system/port/cpu_start.c
View File

@@ -456,6 +456,7 @@ void IRAM_ATTR call_start_cpu0(void)
#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
clock_hz = UART_CLK_FREQ_ROM; // From esp32-s3 on, UART clock source is selected to XTAL in ROM clock_hz = UART_CLK_FREQ_ROM; // From esp32-s3 on, UART clock source is selected to XTAL in ROM
#endif #endif
esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
esp_rom_uart_set_clock_baudrate(CONFIG_ESP_CONSOLE_UART_NUM, clock_hz, CONFIG_ESP_CONSOLE_UART_BAUDRATE); esp_rom_uart_set_clock_baudrate(CONFIG_ESP_CONSOLE_UART_NUM, clock_hz, CONFIG_ESP_CONSOLE_UART_BAUDRATE);
#endif #endif

2
tools/cmake/targets.cmake
View File

@@ -32,7 +32,7 @@ macro(__target_init)
set(env_idf_env_fpga $ENV{IDF_ENV_FPGA}) set(env_idf_env_fpga $ENV{IDF_ENV_FPGA})
if(${env_idf_env_fpga}) if(${env_idf_env_fpga})
idf_build_set_property(__IDF_ENV_FPGA "y") idf_build_set_property(__IDF_ENV_FPGA "y")
message(STATUS "IDF_ENV_FPGA is set, building for FPGA environment") message(NOTICE "IDF_ENV_FPGA is set, building for FPGA environment")
endif() endif()
endmacro() endmacro()