Skip to content

Commit 6fde8cf

Browse files
wancklwanckl
committed
ci(esp32c61): disable soc_caps, docs, test for eco3 update
1 parent 783ea76 commit 6fde8cf

File tree

126 files changed

+275
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+275
-362
lines changed

‎components/esp_hw_support/lowpower/port/esp32c61/sleep_clock.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ bool clock_domain_pd_allowed(void)
8181
* necessary to check the state of CLOCK_MODEM to determine MODEM domain on
8282
* or off. The clock and reset of digital peripherals are managed through
8383
* PCR, with TOP domain similar to MODEM domain. */
84+
#if SOC_WIFI_SUPPORTED || SOC_BT_SUPPORTED
8485
sleep_retention_module_bitmap_t modem_clk_dep_modules = (sleep_retention_module_bitmap_t){ .bitmap = { 0 } };
86+
#endif
8587
#if SOC_WIFI_SUPPORTED
8688
modem_clk_dep_modules.bitmap[SLEEP_RETENTION_MODULE_WIFI_MAC >> 5] |= BIT(SLEEP_RETENTION_MODULE_WIFI_MAC % 32);
8789
modem_clk_dep_modules.bitmap[SLEEP_RETENTION_MODULE_WIFI_BB >> 5] |= BIT(SLEEP_RETENTION_MODULE_WIFI_BB % 32);

‎components/esp_wifi/test_apps/bin_size_apsta/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

‎components/esp_wifi/test_apps/wifi_connect/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

‎components/esp_wifi/test_apps/wifi_function/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
33

‎components/esp_wifi/test_apps/wifi_nvs_config/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

‎components/soc/esp32c61/include/soc/Kconfig.soc_caps.in‎

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ config SOC_GPTIMER_SUPPORTED
3131
bool
3232
default y
3333

34-
config SOC_BT_SUPPORTED
35-
bool
36-
default y
37-
3834
config SOC_USB_SERIAL_JTAG_SUPPORTED
3935
bool
4036
default y
@@ -47,14 +43,6 @@ config SOC_TEMP_SENSOR_SUPPORTED
4743
bool
4844
default y
4945

50-
config SOC_PHY_SUPPORTED
51-
bool
52-
default y
53-
54-
config SOC_WIFI_SUPPORTED
55-
bool
56-
default y
57-
5846
config SOC_SUPPORTS_SECURE_DL_MODE
5947
bool
6048
default y
@@ -1214,83 +1202,3 @@ config SOC_TEMPERATURE_SENSOR_SUPPORT_SLEEP_RETENTION
12141202
config SOC_TEMPERATURE_SENSOR_UNDER_PD_TOP_DOMAIN
12151203
bool
12161204
default y
1217-
1218-
config SOC_WIFI_HW_TSF
1219-
bool
1220-
default y
1221-
1222-
config SOC_WIFI_FTM_SUPPORT
1223-
bool
1224-
default n
1225-
1226-
config SOC_WIFI_GCMP_SUPPORT
1227-
bool
1228-
default y
1229-
1230-
config SOC_WIFI_WAPI_SUPPORT
1231-
bool
1232-
default y
1233-
1234-
config SOC_WIFI_CSI_SUPPORT
1235-
bool
1236-
default y
1237-
1238-
config SOC_WIFI_MESH_SUPPORT
1239-
bool
1240-
default y
1241-
1242-
config SOC_WIFI_HE_SUPPORT
1243-
bool
1244-
default y
1245-
1246-
config SOC_WIFI_MAC_VERSION_NUM
1247-
int
1248-
default 3
1249-
1250-
config SOC_WIFI_NAN_SUPPORT
1251-
bool
1252-
default y
1253-
1254-
config SOC_BLE_SUPPORTED
1255-
bool
1256-
default y
1257-
1258-
config SOC_BLE_MESH_SUPPORTED
1259-
bool
1260-
default y
1261-
1262-
config SOC_ESP_NIMBLE_CONTROLLER
1263-
bool
1264-
default y
1265-
1266-
config SOC_BLE_50_SUPPORTED
1267-
bool
1268-
default y
1269-
1270-
config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
1271-
bool
1272-
default y
1273-
1274-
config SOC_BLE_POWER_CONTROL_SUPPORTED
1275-
bool
1276-
default y
1277-
1278-
config SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
1279-
bool
1280-
default y
1281-
1282-
config SOC_BLUFI_SUPPORTED
1283-
bool
1284-
default y
1285-
1286-
config SOC_BLE_MULTI_CONN_OPTIMIZATION
1287-
bool
1288-
default y
1289-
1290-
config SOC_BLE_CTE_SUPPORTED
1291-
bool
1292-
default y
1293-
1294-
config SOC_PHY_COMBO_MODULE
1295-
bool
1296-
default y

‎components/soc/esp32c61/include/soc/soc_caps.h‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#define SOC_GDMA_SUPPORTED 1
2525
#define SOC_AHB_GDMA_SUPPORTED 1
2626
#define SOC_GPTIMER_SUPPORTED 1
27-
#define SOC_BT_SUPPORTED 1
27+
// #define SOC_BT_SUPPORTED 1 // TODO: IDF-13139, re-enable for c61 eco3
2828
// \#define SOC_IEEE802154_SUPPORTED 1
2929
#define SOC_USB_SERIAL_JTAG_SUPPORTED 1
3030
#define SOC_ASYNC_MEMCPY_SUPPORTED 1
3131
#define SOC_TEMP_SENSOR_SUPPORTED 1
32-
#define SOC_PHY_SUPPORTED 1
33-
#define SOC_WIFI_SUPPORTED 1
32+
// #define SOC_PHY_SUPPORTED 1 //TODO: IDF-13141, re-open for c61 eco3
33+
// #define SOC_WIFI_SUPPORTED 1 //TODO: IDF-13138, re-open on c61 eco3
3434
#define SOC_SUPPORTS_SECURE_DL_MODE 1
3535
#define SOC_EFUSE_KEY_PURPOSE_FIELD 1
3636
#define SOC_EFUSE_SUPPORTED 1
@@ -498,30 +498,32 @@
498498
#define SOC_TEMPERATURE_SENSOR_UNDER_PD_TOP_DOMAIN (1)
499499

500500
/*------------------------------------ WI-FI CAPS ------------------------------------*/
501-
#define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
502-
#define SOC_WIFI_FTM_SUPPORT (0) /*!< Support FTM */
503-
#define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
504-
#define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
505-
#define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
506-
#define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
507-
#define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
508-
#define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
509-
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
510-
511-
/*---------------------------------- Bluetooth CAPS ----------------------------------*/
512-
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
513-
#define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
514-
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
515-
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
516-
#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
517-
#define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
518-
#define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
519-
#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */
520-
#define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
521-
#define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
501+
//TODO: IDF-13138, re-open on c61 eco3
502+
// #define SOC_WIFI_HW_TSF (1) /*!< Support hardware TSF */
503+
// #define SOC_WIFI_FTM_SUPPORT (0) /*!< Support FTM */
504+
// #define SOC_WIFI_GCMP_SUPPORT (1) /*!< Support GCMP(GCMP128 and GCMP256) */
505+
// #define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */
506+
// #define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */
507+
// #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */
508+
// #define SOC_WIFI_HE_SUPPORT (1) /*!< Support Wi-Fi 6 */
509+
// #define SOC_WIFI_MAC_VERSION_NUM (3) /*!< Wi-Fi MAC version num is 3 */
510+
// #define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
511+
512+
// /*---------------------------------- Bluetooth CAPS ----------------------------------*/
513+
// TODO: IDF-13139, re-enable for c61 eco3
514+
// #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
515+
// #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
516+
// #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
517+
// #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
518+
// #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
519+
// #define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
520+
// #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
521+
// #define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */
522+
// #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
523+
// #define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
522524

523525
/*------------------------------------- PHY CAPS -------------------------------------*/
524-
#define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/
526+
// #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/
525527

526528
/*------------------------------------- No Reset CAPS -------------------------------------*/
527529
// \#define SOC_CAPS_NO_RESET_BY_ANA_BOD (1) //TODO: [ESP32C61] IDF-9254

‎components/wpa_supplicant/test_apps/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
33

44
# wpa_supplicant unit test
55

‎docs/conf_common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287

288288
ESP32C5_DOCS = ['api-guides/phy.rst', 'api-reference/peripherals/sd_pullup_requirements.rst']
289289

290-
ESP32C61_DOCS = ['api-guides/phy.rst']
290+
ESP32C61_DOCS = [] # TODO: IDF-13141, re-open for c61 eco3
291291

292292
ESP32C6_DOCS = [
293293
'api-guides/RF_calibration.rst',

‎docs/doxygen/Doxyfile_esp32c61‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
INPUT += \
22
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he_types.h \
33
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he.h \
4-
$(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt.h \
5-
$(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt_vs.h \
4+
# //TODO: IDF-13141, re-open for c61 eco3
5+
# $(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt.h \
6+
# $(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt_vs.h \

0 commit comments

Comments
 (0)