forked from espressif/esp-idf
Merge branch 'fix/console_none_build_issues' into 'master'
fix(console): Fix build issues when CONFIG_ESP_CONSOLE_NONE is enabled Closes IDFGH-11900 See merge request espressif/esp-idf!29295
This commit is contained in:
@@ -22,7 +22,9 @@
|
|||||||
|
|
||||||
#include "console_private.h"
|
#include "console_private.h"
|
||||||
|
|
||||||
|
#if !CONFIG_ESP_CONSOLE_NONE
|
||||||
static const char *TAG = "console.repl";
|
static const char *TAG = "console.repl";
|
||||||
|
#endif // !CONFIG_ESP_CONSOLE_NONE
|
||||||
|
|
||||||
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
|
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
|
||||||
static esp_err_t esp_console_repl_uart_delete(esp_console_repl_t *repl);
|
static esp_err_t esp_console_repl_uart_delete(esp_console_repl_t *repl);
|
||||||
|
@@ -207,10 +207,12 @@ esp_err_t esp_vfs_console_register(void)
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#if !CONFIG_ESP_CONSOLE_NONE
|
||||||
err = esp_vfs_register_common(primary_path, strlen(primary_path), primary_vfs, NULL, &primary_vfs_index);
|
err = esp_vfs_register_common(primary_path, strlen(primary_path), primary_vfs, NULL, &primary_vfs_index);
|
||||||
if (err != ESP_OK) {
|
if (err != ESP_OK) {
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
#endif // !CONFIG_ESP_CONSOLE_NONE
|
||||||
|
|
||||||
// Secondary register part.
|
// Secondary register part.
|
||||||
#if CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
|
#if CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
|
||||||
|
@@ -0,0 +1,6 @@
|
|||||||
|
# Config to test that console can build with all outputs set to none (both primary and secondary)
|
||||||
|
|
||||||
|
# Using ESP32-C3 because it supports a secondary console output (i.e., USJ)
|
||||||
|
CONFIG_IDF_TARGET="esp32c3"
|
||||||
|
CONFIG_ESP_CONSOLE_NONE=y
|
||||||
|
CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
|
Reference in New Issue
Block a user