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
espressif · Feb 29, 2024 · 6817e9f · 6817e9f
2 parents afbed25 + 87e2d84
commit 6817e9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/components/console/esp_console_repl_chip.c b/components/console/esp_console_repl_chip.c
@@ -22,7 +22,9 @@
 
 #include "console_private.h"
 
+#if !CONFIG_ESP_CONSOLE_NONE
 static const char *TAG = "console.repl";
+#endif // !CONFIG_ESP_CONSOLE_NONE
 
 #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);

diff --git a/components/vfs/vfs_console.c b/components/vfs/vfs_console.c
@@ -207,10 +207,12 @@ esp_err_t esp_vfs_console_register(void)
         return err;
     }
 #endif
+#if !CONFIG_ESP_CONSOLE_NONE
     err = esp_vfs_register_common(primary_path, strlen(primary_path), primary_vfs, NULL, &primary_vfs_index);
     if (err != ESP_OK) {
         return err;
     }
+#endif // !CONFIG_ESP_CONSOLE_NONE
 
 // Secondary register part.
 #if CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG

diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.console_none_esp32c3 b/tools/test_apps/system/build_test/sdkconfig.ci.console_none_esp32c3
@@ -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