ESP32: Remove unused config (#36869)

DejinChen · web-flow · commit 204fb273dd37 · 2024-12-19T07:56:33.000Z
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -310,6 +310,10 @@ if (CONFIG_CHIP_DEVICE_ENABLE_DYNAMIC_SERVER)
     chip_gn_arg_append("chip_build_controller_dynamic_server" "true")
 endif()
 
+if (CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS)
+    chip_gn_arg_append("icd_max_notification_subscribers" ${CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS})
+endif()
+
 set(args_gn_input "${CMAKE_CURRENT_BINARY_DIR}/args.gn.in")
 file(GENERATE OUTPUT "${args_gn_input}" CONTENT "${chip_gn_args}")
 
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -47,15 +47,6 @@ menu "CHIP Core"
                 Each fabric can provision the device with its unique operational credentials and
                 manage its own access control lists.
 
-        config MAX_PEER_NODES
-            int "Max Peer Nodes"
-            range 0 65535
-            default 16
-            help
-                The maximum number of peer nodes that the local node can communicate with using
-                connectionless communication (e.g. UDP).  This value sizes a table that tracks
-                communication state with peer nodes by their CHIP node id.
-
         config MAX_UNSOLICITED_MESSAGE_HANDLERS
             int "Max Unsolicited Message Handlers"
             range 0 65535
@@ -223,28 +214,6 @@ menu "CHIP Core"
                 CHIP generally needs one UDP EndPoint object for each local network
                 interface, plus 2 additional EndPoints for general UDP communcation.
 
-        config MAX_CONNECTIONS
-            int "Max CHIP Connections"
-            range 0 65535
-            default 8
-            help
-                The maximum number of simultaneously active CHIP connections, either locally
-                or remotely initiated.  This limit covers both CHIP TCP connections, and
-                CHIP-over-BLE (WoBLE) connections.
-
-        config DEFAULT_INCOMING_CONNECTION_IDLE_TIMEOUT
-            int "Default Incoming Connection Idle Timeout (ms)"
-            range 0 1000000
-            default 15000
-            help
-                The maximum amount of time, in milliseconds, that an idle inbound
-                CHIP connection will be allowed to exist before being closed.
-
-                This is a default value that can be overridden at runtime by the
-                application.
-
-                A value of 0 disables automatic closing of idle connections.
-
         config ENABLE_ROUTE_HOOK
             bool "Enable route hook"
             depends on LWIP_HOOK_IP6_ROUTE_DEFAULT && LWIP_HOOK_ND6_GET_GW_DEFAULT
@@ -643,58 +612,6 @@ menu "CHIP Device Layer"
 
     endmenu
 
-    menu "WiFi AP Options"
-
-        config ENABLE_WIFI_AP
-            depends on ESP_WIFI_SOFTAP_SUPPORT
-            bool "Enable CHIP WIFI AP"
-            default y
-            help
-                Enables WiFi AP for CHIP.
-
-        config WIFI_AP_SSID_PREFIX
-            string "WiFi AP SSID Prefix"
-            default "MATTER-"
-            depends on ENABLE_WIFI_AP
-            help
-                A prefix string used in forming the WiFi soft-AP SSID.  The remainder of the SSID
-                consists of the final two bytes of the device's primary WiFi MAC address in hex.
-
-        config WIFI_AP_CHANNEL
-            int "WiFi AP Channel"
-            range 1 14
-            default 1
-            depends on ENABLE_WIFI_AP
-            help
-                The WiFi channel number to be used by the soft-AP.
-
-        config WIFI_AP_MAX_STATIONS
-            int "WiFi AP Max Allowed Stations"
-            range 1 10
-            default 4
-            depends on ENABLE_WIFI_AP
-            help
-                The maximum number of stations allowed to connect to the soft-AP.
-
-        config WIFI_AP_BEACON_INTERVAL
-            int "WiFi AP Beacon Interval (ms)"
-            range 100 60000
-            default 100
-            depends on ENABLE_WIFI_AP
-            help
-                The beacon interval (in milliseconds) for the WiFi soft-AP.
-
-        config WIFI_AP_IDLE_TIMEOUT
-            int "WiFi AP Idle Timeout (ms)"
-            range 0 600000
-            default 120000
-            depends on ENABLE_WIFI_AP
-            help
-                The amount of time (in milliseconds) after which the CHIP platform will deactivate the soft-AP
-                if it has been idle.
-
-    endmenu
-
     menu "BLE Options"
         visible if BT_ENABLED
 
@@ -853,85 +770,7 @@ menu "CHIP Device Layer"
 
     endmenu
 
-    menu "Time Sync Options"
-
-        config ENABLE_SERVICE_DIRECTORY_TIME_SYNC
-            bool "Enable Service Directory Time Sync"
-            default y
-            help
-                Enables synchronizing the device real-time clock using information returned during
-                a CHIP service directory query.  For any device that uses the CHIP service directory
-                to lookup a tunnel server, enabling this option will result in the real time clock being
-                synchronized every time the service tunnel is established.
-
-        config ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-            bool "Enable Time Service Time Sync"
-            default n
-            help
-                Enables synchronizing the device's real time clock with a remote CHIP Time service
-                using the CHIP Time Sync protocol.
-
-        config CHIP_TIME_SERVICE_ENDPOINT_ID
-            hex "CHIP Time Service Endpoint Id"
-            default 18B4300200000005
-            depends on ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-            help
-                Specifies the service endpoint id of the CHIP Time Sync service to be used to synchronize time.
-
-        config DEFAULT_TIME_SYNC_INTERVAL
-            int "Time Sync Interval (seconds)"
-            default 60
-            depends on ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-            help
-                Specifies the minimum interval (in seconds) at which the device should synchronize its real time
-                clock with the configured CHIP Time Sync server.
-
-        config TIME_SYNC_TIMEOUT
-            int "Time Sync Timeout (ms)"
-            default 10000
-            depends on ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
-            help
-                Specifies the maximum amount of time (in milliseconds) to wait for a response from a
-                CHIP Time Sync server.
-
-    endmenu
-
-    menu "Service Provisioning Options"
-
-        config SERVICE_PROVISIONING_ENDPOINT_ID
-            hex "CHIP Service Provisioning Endpoint Id"
-            default 18B4300200000010
-            help
-                Specifies the service endpoint id of the CHIP Service Provisioning service.  When a device
-                undergoes service provisioning, this is the endpoint to which it will send its Pair Device
-                to Account request.
-
-        config SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT
-            int "Service Provisioning Connectivity Timeout (ms)"
-            default 10000
-            help
-                The maximum amount of time (in milliseconds) to wait for service connectivity during the device
-                service provisioning step.  More specifically, this is the maximum amount of time the device will
-                wait for connectivity to be established with the service at the point where the device waiting
-                to send a Pair Device to Account request to the Service Provisioning service.
-
-        config SERVICE_PROVISIONING_REQUEST_TIMEOUT
-            int "Service Provisioning Request Timeout (ms)"
-            default 10000
-            help
-                Specifies the maximum amount of time (in milliseconds) to wait for a response from the Service
-                Provisioning service.
-
-    endmenu
-
     menu "Commissioning options"
-        config RENDEZVOUS_WAIT_FOR_COMMISSIONING_COMPLETE
-            int "Use full IP-based commissioning (expect cluster commands)"
-            default 0
-            help
-                Setting this to y will cause the commissioner to send commissioning commands to the
-                various clusters after establishing a PASE session.
-
         config ENABLE_ROTATING_DEVICE_ID
             depends on ENABLE_CHIPOBLE
             bool "Enable Rotating Device Identifier Support"
@@ -1065,24 +904,6 @@ menu "CHIP Device Layer"
                 The EnableKey in hex string format used by TestEventTrigger command in GeneralDiagnostics
                 cluster. The length of the string should be 32.
 
-        config ENABLE_FIXED_TUNNEL_SERVER
-            bool "Use Fixed Tunnel Server"
-            default n
-            help
-                Forces the use of a service tunnel server at a fixed IP address and port.  This
-                bypasses the need for a directory query to the service directory endpoint to
-                determine the tunnel server address.  When enabled, this option allows devices
-                that haven't been service provisioned to establish a service tunnel.
-
-        config TUNNEL_SERVER_ADDRESS
-            string "Tunnel Server Address"
-            default ""
-            depends on ENABLE_FIXED_TUNNEL_SERVER
-            help
-                The IP address and port of the server to which the device should establish a service tunnel.
-                The supplied address must be a dot-notation IP address--not a host name.  The port number is
-                optional; if present it should be separated from the IP address with a colon (e.g. 192.168.1.100:5540).
-
     endmenu
 
     menu "Network Telemetry Options"
diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6 b/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32c6
@@ -53,7 +53,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Wi-Fi Settings
 CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32h2 b/examples/all-clusters-app/esp32/sdkconfig.defaults.esp32h2
@@ -64,7 +64,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Disable STA and AP for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/energy-management-app/esp32/sdkconfig.defaults.esp32c6 b/examples/energy-management-app/esp32/sdkconfig.defaults.esp32c6
@@ -53,7 +53,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Wi-Fi Settings
 CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/energy-management-app/esp32/sdkconfig.defaults.esp32h2 b/examples/energy-management-app/esp32/sdkconfig.defaults.esp32h2
@@ -67,7 +67,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Disable STA and AP for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32c6
@@ -53,7 +53,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Wi-Fi Settings
 CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
@@ -67,7 +67,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Disable STA and AP for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/examples/lit-icd-app/esp32/sdkconfig.defaults b/examples/lit-icd-app/esp32/sdkconfig.defaults
@@ -51,7 +51,6 @@ CONFIG_PARTITION_TABLE_OFFSET=0xC000
 
 # Disable STA and AP for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-CONFIG_ENABLE_WIFI_AP=n
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
 
 # Disable chip shell
diff --git a/examples/lock-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lock-app/esp32/sdkconfig.defaults.esp32c6
@@ -52,7 +52,6 @@ CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 
 # Wi-Fi Settings
 CONFIG_ENABLE_WIFI_STATION=y
-CONFIG_ENABLE_WIFI_AP=n
 # Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 
diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -121,9 +121,6 @@
 #define CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX
 #define CHIP_DEVICE_CONFIG_CHIPOBLE_SINGLE_CONNECTION CONFIG_CHIPOBLE_SINGLE_CONNECTION
 #define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART
-#define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID CONFIG_SERVICE_PROVISIONING_ENDPOINT_ID
-#define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT CONFIG_SERVICE_PROVISIONING_CONNECTIVITY_TIMEOUT
-#define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT
 #define CHIP_DEVICE_CONFIG_ENABLE_TEST_SETUP_PARAMS CONFIG_ENABLE_TEST_SETUP_PARAMS
 #define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_USE_TEST_SERIAL_NUMBER
 
