Add USB Video Driver support and fix build with latest IDF master

components/arduino_tinyusb/Kconfig.projbuild

@@ -59,7 +59,8 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_MSC_BUFSIZE
             int "MSC Buffer size"
-            default 64
+            range 512 4096
+            default 512
             depends on TINYUSB_MSC_ENABLED
             help
                 MSC Buffer size
@@ -123,6 +124,39 @@ menu "Arduino TinyUSB"
 
     endmenu
 
+    menu "VIDEO driver"
+        depends on TINYUSB_ENABLED
+
+        config TINYUSB_VIDEO_ENABLED
+            bool "Enable USB VIDEO TinyUSB driver"
+            default y
+            help
+                Enable USB VIDEO TinyUSB driver.
+
+        config TINYUSB_DESC_VIDEO_STRING
+            string "VIDEO Device String"
+            default "Espressif VIDEO Device"
+            depends on TINYUSB_VIDEO_ENABLED
+            help
+                Specify name of the VIDEO device
+
+        config TINYUSB_VIDEO_STREAMING_BUFSIZE
+            int "VIDEO streaming endpoint size"
+            range 64 4096
+            default 256
+            depends on TINYUSB_VIDEO_ENABLED
+            help
+                VIDEO streaming endpoint size
+
+        config TINYUSB_VIDEO_STREAMING_IFS
+            int "Number of VIDEO streaming interfaces"
+            range 1 3
+            default 1
+            depends on TINYUSB_VIDEO_ENABLED
+            help
+                The number of VIDEO streaming interfaces
+    endmenu
+
     menu "DFU Runtime driver"
         depends on TINYUSB_ENABLED
 

components/arduino_tinyusb/include/tusb_config.h

@@ -52,6 +52,10 @@ extern "C" {
 #   define CONFIG_TINYUSB_MIDI_ENABLED 0
 #endif
 
+#ifndef CONFIG_TINYUSB_VIDEO_ENABLED
+#   define CONFIG_TINYUSB_VIDEO_ENABLED 0
+#endif
+
 #ifndef CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED
 #   define CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED 0
 #endif
@@ -99,6 +103,7 @@ extern "C" {
 #define CFG_TUD_MSC 				CONFIG_TINYUSB_MSC_ENABLED
 #define CFG_TUD_HID 				CONFIG_TINYUSB_HID_ENABLED
 #define CFG_TUD_MIDI 				CONFIG_TINYUSB_MIDI_ENABLED
+#define CFG_TUD_VIDEO               CONFIG_TINYUSB_VIDEO_ENABLED
 #define CFG_TUD_CUSTOM_CLASS 		CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED
 #define CFG_TUD_DFU_RUNTIME			CONFIG_TINYUSB_DFU_RT_ENABLED
 #define CFG_TUD_VENDOR 				CONFIG_TINYUSB_VENDOR_ENABLED
@@ -117,6 +122,10 @@ extern "C" {
 #define CFG_TUD_MIDI_RX_BUFSIZE		CONFIG_TINYUSB_MIDI_RX_BUFSIZE
 #define CFG_TUD_MIDI_TX_BUFSIZE		CONFIG_TINYUSB_MIDI_TX_BUFSIZE
 
+// The number of video streaming interfaces and  endpoint size
+#define CFG_TUD_VIDEO_STREAMING     CONFIG_TINYUSB_VIDEO_STREAMING_IFS
+#define CFG_TUD_VIDEO_STREAMING_EP_BUFSIZE  CONFIG_TINYUSB_VIDEO_STREAMING_BUFSIZE
+
 // VENDOR FIFO size of TX and RX
 #define CFG_TUD_VENDOR_RX_BUFSIZE 	CONFIG_TINYUSB_VENDOR_RX_BUFSIZE
 #define CFG_TUD_VENDOR_TX_BUFSIZE 	CONFIG_TINYUSB_VENDOR_TX_BUFSIZE

sdkconfig.esp32

@@ -63,6 +63,7 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -82,7 +83,9 @@ CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -263,10 +266,9 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32=y
 
 #
-# Bluetooth controller(ESP32 Dual Mode Bluetooth)
+# Bluetooth controller
 #
 # CONFIG_BTDM_CTRL_MODE_BLE_ONLY is not set
 # CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set
@@ -318,37 +320,9 @@ CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-# end of Bluetooth controller(ESP32 Dual Mode Bluetooth)
+CONFIG_BTDM_RESERVE_DRAM=0xdb5c
-
+CONFIG_BTDM_CTRL_HLI=y
-CONFIG_BT_CTRL_MODE_EFF=1
+# end of Bluetooth controller
-CONFIG_BT_CTRL_BLE_MAX_ACT=10
-CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10
-CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0
-CONFIG_BT_CTRL_PINNED_TO_CORE=0
-CONFIG_BT_CTRL_HCI_TL=1
-CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
-CONFIG_BT_CTRL_HW_CCA_EFF=0
-CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=0
-CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
-CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
-CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-CONFIG_BT_CTRL_BLE_SCAN_DUPL=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0
-CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100
-
-#
-# MODEM SLEEP Options
-#
-# end of MODEM SLEEP Options
-
-CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
-CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
-CONFIG_BT_CTRL_HCI_TL_EFF=1
-
-#
-# MODEM SLEEP Options
-#
-# end of MODEM SLEEP Options
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -371,7 +345,7 @@ CONFIG_BT_HFP_CLIENT_ENABLE=y
 # CONFIG_BT_HFP_AG_ENABLE is not set
 CONFIG_BT_HFP_AUDIO_DATA_PATH_PCM=y
 # CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI is not set
-# CONFIG_BT_HID_HOST_ENABLED is not set
+# CONFIG_BT_HID_ENABLED is not set
 CONFIG_BT_SSP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=y
 CONFIG_BT_GATTS_ENABLE=y
@@ -396,10 +370,7 @@ CONFIG_BT_SMP_ENABLE=y
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 # CONFIG_BT_BLE_RPA_SUPPORTED is not set
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
-
-CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 # end of Bluetooth
 
 # CONFIG_BLE_MESH is not set
@@ -424,6 +395,12 @@ CONFIG_COAP_LOG_DEFAULT_LEVEL=0
 CONFIG_ADC_DISABLE_DAC=y
 # end of ADC configuration
 
+#
+# MCPWM configuration
+#
+# CONFIG_MCPWM_ISR_IN_IRAM is not set
+# end of MCPWM configuration
+
 #
 # SPI configuration
 #
@@ -479,6 +456,7 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 CONFIG_ESP_TLS_USING_MBEDTLS=y
 # CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set
 # CONFIG_ESP_TLS_SERVER is not set
+# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
 # CONFIG_ESP_TLS_INSECURE is not set
 # end of ESP-TLS
@@ -707,6 +685,8 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 # Sleep Config
 #
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
+# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set
+# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 # end of Sleep Config
 # end of Hardware Settings
 
@@ -721,6 +701,12 @@ CONFIG_ESP_IPC_ISR_ENABLE=y
 #
 # LCD and Touch Panel
 #
+
+#
+# LCD Peripheral Configuration
+#
+CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
+# end of LCD Peripheral Configuration
 # end of LCD and Touch Panel
 
 #
@@ -786,6 +772,7 @@ CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 # CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y
 # end of ESP System Settings
 
 #
@@ -907,6 +894,8 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
+CONFIG_FMB_MASTER_TIMER_GROUP=0
+CONFIG_FMB_MASTER_TIMER_INDEX=0
 # CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
 # end of Modbus configuration
 
@@ -947,6 +936,8 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 # CONFIG_FREERTOS_FPU_IN_ISR is not set
+CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
+# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
 # end of FreeRTOS
 
 #
@@ -1011,6 +1002,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # CONFIG_LWIP_NETIF_API is not set
+# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
@@ -1035,6 +1027,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 
 #
 # DHCP server
@@ -1049,7 +1042,6 @@ CONFIG_LWIP_IPV6=y
 # CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
 # CONFIG_LWIP_IPV6_FORWARD is not set
-CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=0
 # CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
@@ -1127,7 +1119,8 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # SNTP
 #
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_MAX_SERVERS=1
+# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
@@ -1290,6 +1283,8 @@ CONFIG_MDNS_TASK_AFFINITY=0x0
 CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
 # CONFIG_MDNS_STRICT_MODE is not set
 CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
 # end of mDNS
 
 #
@@ -1474,6 +1469,7 @@ CONFIG_WL_SECTOR_SIZE=4096
 #
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# CONFIG_WIFI_PROV_BLE_BONDING is not set
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1510,37 +1506,6 @@ CONFIG_DSP_MAX_FFT_SIZE_4096=y
 CONFIG_DSP_MAX_FFT_SIZE=4096
 # end of DSP Library
 
-# CONFIG_C_IMPL is not set
-CONFIG_XTENSA_IMPL=y
-
-#
-# ESP-FACE Configuration
-#
-CONFIG_MTMN_LITE_QUANT=y
-# CONFIG_MTMN_LITE_FLOAT is not set
-# CONFIG_MTMN_HEAVY_QUANT is not set
-# CONFIG_FRMN is not set
-CONFIG_MFN56_1X=y
-# CONFIG_MFN56_2X is not set
-# CONFIG_MFN56_3X is not set
-# CONFIG_MFN56_4X is not set
-
-#
-# Object Detection
-#
-# CONFIG_DETECT_WITH_LANDMARK is not set
-# end of Object Detection
-
-#
-# Pose Estimation
-#
-CONFIG_HD_NANO1=y
-# CONFIG_HD_LITE1 is not set
-CONFIG_HP_NANO1=y
-# CONFIG_HP_LITE1 is not set
-# end of Pose Estimation
-# end of ESP-FACE Configuration
-
 #
 # Camera configuration
 #

sdkconfig.esp32c3

@@ -62,6 +62,7 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -91,7 +92,9 @@ CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -232,19 +235,10 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_ESP32C3=y
 CONFIG_BT_SOC_SUPPORT_5_0=y
-CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
-CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
-CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
-CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
-CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
-CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
 
 #
-# Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# Bluetooth controller
 #
 CONFIG_BT_CTRL_MODE_EFF=1
 CONFIG_BT_CTRL_BLE_MAX_ACT=10
@@ -308,12 +302,7 @@ CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
 CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
 CONFIG_BT_CTRL_HCI_TL_EFF=1
 # CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set
-# end of Bluetooth controller(ESP32C3 Bluetooth Low Energy)
+# end of Bluetooth controller
-
-#
-# MODEM SLEEP Options
-#
-# end of MODEM SLEEP Options
 
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
@@ -524,11 +513,7 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
-
-CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=y
-CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 # end of Bluetooth
 
 # CONFIG_BLE_MESH is not set
@@ -553,6 +538,12 @@ CONFIG_COAP_LOG_DEFAULT_LEVEL=0
 CONFIG_ADC_DISABLE_DAC=y
 # end of ADC configuration
 
+#
+# MCPWM configuration
+#
+# CONFIG_MCPWM_ISR_IN_IRAM is not set
+# end of MCPWM configuration
+
 #
 # SPI configuration
 #
@@ -589,6 +580,8 @@ CONFIG_EFUSE_MAX_BLK_LEN=256
 CONFIG_ESP_TLS_USING_MBEDTLS=y
 CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y
 CONFIG_ESP_TLS_SERVER=y
+# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
+# CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
 # CONFIG_ESP_TLS_INSECURE is not set
 # end of ESP-TLS
@@ -712,6 +705,7 @@ CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES=4
 # Sleep Config
 #
 CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
+# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 # end of Sleep Config
 # end of Hardware Settings
 
@@ -724,6 +718,12 @@ CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 #
 # LCD and Touch Panel
 #
+
+#
+# LCD Peripheral Configuration
+#
+CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
+# end of LCD Peripheral Configuration
 # end of LCD and Touch Panel
 
 #
@@ -767,8 +767,11 @@ CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 #
 # Memory protection
 #
+CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y
 CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y
 CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y
+CONFIG_ESP_SYSTEM_MEMPROT_CPU_PREFETCH_PAD_SIZE=16
+CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=512
 # end of Memory protection
 
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
@@ -792,6 +795,7 @@ CONFIG_ESP_TASK_WDT=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 # CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y
 # end of ESP System Settings
 
 #
@@ -909,6 +913,8 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
+CONFIG_FMB_MASTER_TIMER_GROUP=0
+CONFIG_FMB_MASTER_TIMER_INDEX=0
 # CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
 # end of Modbus configuration
 
@@ -950,6 +956,8 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
 # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
+CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
+# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
 # end of FreeRTOS
 
 #
@@ -1012,6 +1020,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # CONFIG_LWIP_NETIF_API is not set
+# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
@@ -1036,6 +1045,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 
 #
 # DHCP server
@@ -1050,7 +1060,6 @@ CONFIG_LWIP_IPV6=y
 # CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
 # CONFIG_LWIP_IPV6_FORWARD is not set
-CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=0
 # CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
@@ -1119,7 +1128,8 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # SNTP
 #
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_MAX_SERVERS=1
+# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
@@ -1282,6 +1292,8 @@ CONFIG_MDNS_TASK_AFFINITY=0x0
 CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
 # CONFIG_MDNS_STRICT_MODE is not set
 CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
 # end of mDNS
 
 #
@@ -1466,6 +1478,7 @@ CONFIG_WL_SECTOR_SIZE=4096
 #
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# CONFIG_WIFI_PROV_BLE_BONDING is not set
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1545,10 +1558,6 @@ CONFIG_STACK_CHECK_NONE=y
 # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BLUEDROID_ENABLED=y
 # CONFIG_NIMBLE_ENABLED is not set
 CONFIG_BTC_TASK_STACK_SIZE=3072

sdkconfig.esp32s2

@@ -62,6 +62,7 @@ CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x10
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -92,7 +93,9 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -221,6 +224,15 @@ CONFIG_TINYUSB_MIDI_RX_BUFSIZE=64
 CONFIG_TINYUSB_MIDI_TX_BUFSIZE=64
 # end of MIDI driver
 
+#
+# VIDEO driver
+#
+CONFIG_TINYUSB_VIDEO_ENABLED=y
+CONFIG_TINYUSB_DESC_VIDEO_STRING="Espressif VIDEO Device"
+CONFIG_TINYUSB_VIDEO_STREAMING_BUFSIZE=256
+CONFIG_TINYUSB_VIDEO_STREAMING_IFS=1
+# end of VIDEO driver
+
 #
 # DFU Runtime driver
 #
@@ -284,36 +296,6 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # CONFIG_ASIO_SSL_SUPPORT is not set
 # end of ESP-ASIO
 
-CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
-CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0
-CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0
-CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
-CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
-CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
-CONFIG_BT_CTRL_MODE_EFF=1
-CONFIG_BT_CTRL_BLE_MAX_ACT=10
-CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10
-CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0
-CONFIG_BT_CTRL_PINNED_TO_CORE=0
-CONFIG_BT_CTRL_HCI_TL=1
-CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
-CONFIG_BT_CTRL_HW_CCA_EFF=0
-CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=0
-CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
-CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
-CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
-CONFIG_BT_CTRL_BLE_SCAN_DUPL=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0
-CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100
-CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
-CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
-CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
-CONFIG_BT_CTRL_HCI_TL_EFF=1
-CONFIG_BT_RESERVE_DRAM=0
-CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
-
 #
 # CoAP Configuration
 #
@@ -334,6 +316,12 @@ CONFIG_COAP_LOG_DEFAULT_LEVEL=0
 CONFIG_ADC_DISABLE_DAC=y
 # end of ADC configuration
 
+#
+# MCPWM configuration
+#
+# CONFIG_MCPWM_ISR_IN_IRAM is not set
+# end of MCPWM configuration
+
 #
 # SPI configuration
 #
@@ -370,6 +358,8 @@ CONFIG_EFUSE_MAX_BLK_LEN=256
 CONFIG_ESP_TLS_USING_MBEDTLS=y
 CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y
 CONFIG_ESP_TLS_SERVER=y
+# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
+# CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
 # CONFIG_ESP_TLS_INSECURE is not set
 # end of ESP-TLS
@@ -429,6 +419,7 @@ CONFIG_SPIRAM_USE_MALLOC=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
 
 # CONFIG_ESP32S2_TRAX is not set
@@ -545,6 +536,8 @@ CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2
 # Sleep Config
 #
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
+# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set
+# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 # end of Sleep Config
 # end of Hardware Settings
 
@@ -557,6 +550,12 @@ CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 #
 # LCD and Touch Panel
 #
+
+#
+# LCD Peripheral Configuration
+#
+CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
+# end of LCD Peripheral Configuration
 # end of LCD and Touch Panel
 
 #
@@ -598,8 +597,11 @@ CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 #
 # Memory protection
 #
+CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y
 CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y
 CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y
+CONFIG_ESP_SYSTEM_MEMPROT_CPU_PREFETCH_PAD_SIZE=16
+CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=4
 # end of Memory protection
 
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
@@ -624,6 +626,7 @@ CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 # CONFIG_ESP_PANIC_HANDLER_IRAM is not set
+CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y
 # end of ESP System Settings
 
 #
@@ -665,6 +668,7 @@ CONFIG_ESP_WIFI_FTM_ENABLE=y
 CONFIG_ESP_WIFI_FTM_INITIATOR_SUPPORT=y
 CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT=y
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
+# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set
 # end of Wi-Fi
 
 #
@@ -741,6 +745,8 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
+CONFIG_FMB_MASTER_TIMER_GROUP=0
+CONFIG_FMB_MASTER_TIMER_INDEX=0
 # CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
 # end of Modbus configuration
 
@@ -781,6 +787,8 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
 # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
+CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
+# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
 # end of FreeRTOS
 
 #
@@ -845,6 +853,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # CONFIG_LWIP_NETIF_API is not set
+# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
@@ -869,6 +878,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 
 #
 # DHCP server
@@ -883,7 +893,6 @@ CONFIG_LWIP_IPV6=y
 # CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
 # CONFIG_LWIP_IPV6_FORWARD is not set
-CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=0
 # CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
@@ -961,7 +970,8 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # SNTP
 #
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_MAX_SERVERS=1
+# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
@@ -1124,6 +1134,8 @@ CONFIG_MDNS_TASK_AFFINITY=0x0
 CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
 # CONFIG_MDNS_STRICT_MODE is not set
 CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
 # end of mDNS
 
 #
@@ -1285,6 +1297,10 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # USB-OTG
 #
 CONFIG_USB_OTG_SUPPORTED=y
+CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256
+CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y
+# CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set
+# CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT is not set
 # end of USB-OTG
 
 #
@@ -1345,37 +1361,6 @@ CONFIG_DSP_MAX_FFT_SIZE_4096=y
 CONFIG_DSP_MAX_FFT_SIZE=4096
 # end of DSP Library
 
-CONFIG_C_IMPL=y
-# CONFIG_XTENSA_IMPL is not set
-
-#
-# ESP-FACE Configuration
-#
-CONFIG_MTMN_LITE_QUANT=y
-# CONFIG_MTMN_LITE_FLOAT is not set
-# CONFIG_MTMN_HEAVY_QUANT is not set
-# CONFIG_FRMN is not set
-CONFIG_MFN56_1X=y
-# CONFIG_MFN56_2X is not set
-# CONFIG_MFN56_3X is not set
-# CONFIG_MFN56_4X is not set
-
-#
-# Object Detection
-#
-# CONFIG_DETECT_WITH_LANDMARK is not set
-# end of Object Detection
-
-#
-# Pose Estimation
-#
-CONFIG_HD_NANO1=y
-# CONFIG_HD_LITE1 is not set
-CONFIG_HP_NANO1=y
-# CONFIG_HP_LITE1 is not set
-# end of Pose Estimation
-# end of ESP-FACE Configuration
-
 #
 # Camera configuration
 #
@@ -1475,10 +1460,6 @@ CONFIG_WARN_WRITE_STRINGS=y
 # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_ADC2_DISABLE_DAC=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
@@ -1507,6 +1488,7 @@ CONFIG_TASK_WDT_PANIC=y
 CONFIG_TASK_WDT_TIMEOUT_S=5
 # CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_TIMER_TASK_STACK_SIZE=4096
+# CONFIG_EXTERNAL_COEX_ENABLE is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y

tools/prepare-libs.sh

@@ -148,10 +148,10 @@ else
 	fi
 	str="$flags $libs"
 fi
-#if [ "$IDF_TARGET" = "esp32" ]; then
+if [ "$IDF_TARGET" = "esp32" ]; then
-#	LD_SCRIPTS+="-T esp32.rom.redefined.ld "
+	LD_SCRIPTS+="-T esp32.rom.redefined.ld "
-#	PIO_LD_SCRIPTS+="esp32.rom.redefined.ld "
+	PIO_LD_SCRIPTS+="esp32.rom.redefined.ld "
-#fi
+fi
 set -- $str
 for item; do
 	prefix="${item:0:1}"
@@ -443,6 +443,8 @@ function copy_precompiled_lib(){
 mkdir -p "$AR_SDK/ld"
 set -- $LD_SCRIPT_DIRS
 for item; do
+	item="${item%\"}"
+	item="${item#\"}"
 	find "$item" -name '*.ld' -exec cp -f {} "$AR_SDK/ld/" \;
 	for lib in `find "$item" -name '*.a'`; do
 		copy_precompiled_lib "$lib"