Merge pull request #310 from espressif/ci/lock_p4_version

tore-espressif · web-flow · commit 144473705476 · 2025-11-07T10:14:57.000+08:00
ci: Lock ESP32-P4 version to &lt; 3
diff --git a/.idf_build_apps.toml b/.idf_build_apps.toml
@@ -5,6 +5,7 @@ exclude = [
 recursive = true
 manifest_file = ".build-test-rules.yml"
 check_warnings = true
+ignore_warning_file = ".ignore_build_warnings.txt"
 target = "all"
 enable_preview_targets = true
 
diff --git a/.ignore_build_warnings.txt b/.ignore_build_warnings.txt
@@ -0,0 +1 @@
+warning: unknown kconfig symbol 'ESP32P4_SELECTS_REV_LESS_V3' assigned to*
diff --git a/device/esp_tinyusb/test_apps/cdc/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/cdc/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/dconn_detection/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/dconn_detection/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/msc_storage/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/msc_storage/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/ncm/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/ncm/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/runtime_config/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/runtime_config/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/teardown_device/main/test_teardown.c b/device/esp_tinyusb/test_apps/teardown_device/main/test_teardown.c
@@ -22,7 +22,6 @@
 #include "unity.h"
 #include "tinyusb.h"
 #include "tinyusb_default_config.h"
-#include "tusb_cdc_acm.h"
 
 static const char *TAG = "teardown";
 
diff --git a/device/esp_tinyusb/test_apps/teardown_device/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/teardown_device/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/device/esp_tinyusb/test_apps/vendor/sdkconfig.defaults.esp32p4 b/device/esp_tinyusb/test_apps/vendor/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/cdc/usb_host_cdc_acm/test_app/main/usb_device.c b/host/class/cdc/usb_host_cdc_acm/test_app/main/usb_device.c
@@ -8,7 +8,7 @@
 #include "sdkconfig.h"
 #include "tinyusb.h"
 #include "tinyusb_default_config.h"
-#include "tusb_cdc_acm.h"
+#include "tinyusb_cdc_acm.h"
 
 static uint8_t buf[CONFIG_TINYUSB_CDC_RX_BUFSIZE + 1];
 static void tinyusb_cdc_rx_callback(int itf, cdcacm_event_t *event)
@@ -85,10 +85,10 @@ void run_usb_dual_cdc_device(void)
         .callback_line_coding_changed = NULL
     };
 
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+    ESP_ERROR_CHECK(tinyusb_cdcacm_init(&amc_cfg));
 #if (CONFIG_TINYUSB_CDC_COUNT > 1)
     amc_cfg.cdc_port = TINYUSB_CDC_ACM_1;
-    ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+    ESP_ERROR_CHECK(tinyusb_cdcacm_init(&amc_cfg));
 #endif
 
     printf("USB initialization DONE\n");
diff --git a/host/class/cdc/usb_host_cdc_acm/test_app/sdkconfig.defaults.esp32p4 b/host/class/cdc/usb_host_cdc_acm/test_app/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/hid/usb_host_hid/test_app/sdkconfig.defaults.esp32p4 b/host/class/hid/usb_host_hid/test_app/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/msc/usb_host_msc/test_app/sdkconfig.defaults.esp32p4 b/host/class/msc/usb_host_msc/test_app/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/uac/usb_host_uac/test_app/sdkconfig.defaults.esp32p4 b/host/class/uac/usb_host_uac/test_app/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/uvc/usb_host_uvc/examples/basic_uvc_stream/sdkconfig.defaults.esp32p4 b/host/class/uvc/usb_host_uvc/examples/basic_uvc_stream/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/class/uvc/usb_host_uvc/test_app/sdkconfig.defaults.esp32p4 b/host/class/uvc/usb_host_uvc/test_app/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/usb/test/target_test/enum/sdkconfig.defaults.esp32p4 b/host/usb/test/target_test/enum/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/usb/test/target_test/ext_port/sdkconfig.defaults.esp32p4 b/host/usb/test/target_test/ext_port/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/usb/test/target_test/hcd/sdkconfig.ci.esp32p4_psram b/host/usb/test/target_test/hcd/sdkconfig.ci.esp32p4_psram
@@ -1,4 +1,5 @@
 CONFIG_IDF_TARGET="esp32p4"
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
 
 # Enable experimental features, to set PSRAM frequency to 200 MHz
 CONFIG_IDF_EXPERIMENTAL_FEATURES=y
diff --git a/host/usb/test/target_test/hcd/sdkconfig.defaults.esp32p4 b/host/usb/test/target_test/hcd/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
diff --git a/host/usb/test/target_test/usb_host/sdkconfig.defaults.esp32p4 b/host/usb/test/target_test/usb_host/sdkconfig.defaults.esp32p4
@@ -0,0 +1 @@
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+warning: unknown kconfig symbol 'ESP32P4_SELECTS_REV_LESS_V3' assigned to*`