consistency: ensure all configs consistently set NEWLIB_NANO_FORMAT flag

Also add sanity checks for jtag mode and remove unused config
Blockstream · Oct 7, 2024 · 6e95410 · 6e95410
1 parent ba071e6
commit 6e95410
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 75 deletions.
diff --git a/configs/sdkconfig_display_ttgo_tdisplays3.defaults b/configs/sdkconfig_display_ttgo_tdisplays3.defaults
@@ -52,6 +52,7 @@ CONFIG_GC2145_SUPPORT=n
 CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3_ci.defaults
@@ -54,6 +54,7 @@ CONFIG_IDF_TARGET="esp32s3"
 CONFIG_JADE_USE_USB_JTAG_SERIAL=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=y
 CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF=y
 CONFIG_NT99141_SUPPORT=n

diff --git a/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults b/configs/sdkconfig_display_ttgo_tdisplays3procamera.defaults
@@ -50,6 +50,7 @@ CONFIG_GC2145_SUPPORT=n
 CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_display_ttgo_tdisplays3procamera_ci.defaults b/configs/sdkconfig_display_ttgo_tdisplays3procamera_ci.defaults
diff --git a/configs/sdkconfig_display_ttgo_twatchs3.defaults b/configs/sdkconfig_display_ttgo_twatchs3.defaults
@@ -29,8 +29,7 @@ CONFIG_DISPLAY_SPI_HOST=2
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_ESP_COEX_SW_COEXIST_ENABLE=n
-CONFIG_ESP_CONSOLE_NONE=y
-CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=12288
@@ -58,6 +57,8 @@ CONFIG_LOG_COLORS=n
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=y
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3.defaults b/configs/sdkconfig_jade_v2s3.defaults
@@ -50,6 +50,7 @@ CONFIG_GC2145_SUPPORT=n
 CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3_ci.defaults b/configs/sdkconfig_jade_v2s3_ci.defaults
@@ -53,6 +53,9 @@ CONFIG_IDF_TARGET="esp32s3"
 CONFIG_JADE_USE_USB_JTAG_SERIAL=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=y
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3_ndebug.defaults b/configs/sdkconfig_jade_v2s3_ndebug.defaults
@@ -49,6 +49,7 @@ CONFIG_GC2145_SUPPORT=n
 CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3_noradio.defaults b/configs/sdkconfig_jade_v2s3_noradio.defaults
@@ -38,6 +38,7 @@ CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3_noradio_ci.defaults b/configs/sdkconfig_jade_v2s3_noradio_ci.defaults
@@ -41,6 +41,9 @@ CONFIG_JADE_USE_USB_JTAG_SERIAL=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=y
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults b/configs/sdkconfig_jade_v2s3_noradio_ndebug.defaults
@@ -37,6 +37,7 @@ CONFIG_IDF_TARGET="esp32s3"
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/main/serial.c b/main/serial.c
@@ -19,7 +19,18 @@
 #ifdef CONFIG_IDF_TARGET_ESP32S3
 
 #ifdef CONFIG_JADE_USE_USB_JTAG_SERIAL
+
+#if !defined(CONFIG_NEWLIB_STDIN_LINE_ENDING_LF) || !defined(CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF)
+#error                                                                                                                 \
+    "Both CONFIG_NEWLIB_STDIN_LINE_ENDING_LF and CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF must be set for CONFIG_JADE_USE_USB_JTAG_SERIAL mode"
+#endif
+
+#if !defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
+#error "CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG must be set for CONFIG_JADE_USE_USB_JTAG_SERIAL mode"
+#endif
+
 #include <esp_vfs.h>
+
 #else
 #include <tinyusb.h>
 #include <tusb_cdc_acm.h>

diff --git a/production/sdkconfig_jade_v2s3_noradio_prod.defaults b/production/sdkconfig_jade_v2s3_noradio_prod.defaults
@@ -41,6 +41,7 @@ CONFIG_LOG_COLORS=n
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/production/sdkconfig_jade_v2s3_prod.defaults b/production/sdkconfig_jade_v2s3_prod.defaults
@@ -54,6 +54,7 @@ CONFIG_LOG_COLORS=n
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
 CONFIG_MBEDTLS_ECP_RESTARTABLE=y
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n

diff --git a/production/sdkconfig_jade_v2s3_smoketest.defaults b/production/sdkconfig_jade_v2s3_smoketest.defaults
@@ -51,6 +51,9 @@ CONFIG_JADE_QA=y
 CONFIG_JADE_USE_USB_JTAG_SERIAL=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
+CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=y
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF=y
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV2640_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n