Merge branch 'fix/disable_cam_spi_build_error_v6.0' into 'release/v6.0'

test(esp_cam_sensor): fixed cam_spi_slave build errors (v6.0) See merge request espressif/esp-idf!46791
2026-10-01 18:50:34 +03:00 · 2026-03-20 13:14:44 +08:00
parent f99faef51d f784342fd2
commit ef747beca2
10 changed files with 8 additions and 3 deletions
@@ -1,4 +1,3 @@
 dependencies:
-  espressif/esp_cam_sensor: ">=0.5.*"
  sensor_init:
    path: ${IDF_PATH}/examples/peripherals/camera/common_components/sensor_init
@@ -1,2 +1,3 @@
 CONFIG_FREERTOS_HZ=1000
 CONFIG_ESP_TASK_WDT_EN=n
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -2,3 +2,4 @@
 # Espressif IoT Development Framework (ESP-IDF) 5.4.0 Project Minimal Configuration
 #
 CONFIG_ESP_TASK_WDT_EN=n
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -8,7 +8,7 @@
 #include "freertos/FreeRTOSConfig.h"
 #include "sdkconfig.h"

-    .section    .tcm.text,"ax"
+    .section    .spm.text,"ax"
    .global     rv_core_fpu_save
    .type       rv_core_fpu_save,@function
    .align      4
@@ -1 +1,2 @@
 CONFIG_CAMERA_OV2640=y
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -1,3 +1,4 @@
 CONFIG_CAMERA_OV2640=y
 CONFIG_CAMERA_SC030IOT=y
 CONFIG_EXAMPLE_MIPI_DSI_DISP_USE_DMA2D=y
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -1 +1,2 @@
 CONFIG_CAMERA_OV2640=y
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -1,2 +1,3 @@
 CONFIG_CAMERA_SC2336=y
 CONFIG_CAMERA_OV5647=y
+CONFIG_CAM_CTRL_SPI_ENABLE=n
@@ -1,5 +1,4 @@
 dependencies:
-  espressif/esp_cam_sensor: ">=0.5.*"
  idf:
    version: ">=5.3.0"
  isp_af_schemes:
@@ -4,3 +4,4 @@ CONFIG_SPIRAM_SPEED_200M=y
 CONFIG_CAMERA_SC2336=y
 CONFIG_CAMERA_OV5647=y
 CONFIG_CAMERA_OV5647_ENABLE_MOTOR_BY_GPIO0=y
+CONFIG_CAM_CTRL_SPI_ENABLE=n