alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/add_ieee8020154_only_caps_for_esp32hx' into 'master'

Browse Source 
soc: add ieee8020154_ble_only cap for esp32hx

See merge request espressif/esp-idf!21824
This commit is contained in:
Wu Zheng Hui 2022-12-28 20:12:10 +08:00
commit 8a095a74d4
6 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_hw_support/periph_ctrl.c
View File

@ -46,7 +46,7 @@ void periph_module_reset(periph_module_t periph)
portEXIT_CRITICAL_SAFE(&periph_spinlock); portEXIT_CRITICAL_SAFE(&periph_spinlock);
} }
#if CONFIG_ESP32_WIFI_ENABLED #if !SOC_IEEE802154_BLE_ONLY
IRAM_ATTR void wifi_bt_common_module_enable(void) IRAM_ATTR void wifi_bt_common_module_enable(void)
{ {
#if SOC_MODEM_CLOCK_IS_INDEPENDENT #if SOC_MODEM_CLOCK_IS_INDEPENDENT
@ -74,7 +74,9 @@ IRAM_ATTR void wifi_bt_common_module_disable(void)
portEXIT_CRITICAL_SAFE(&periph_spinlock); portEXIT_CRITICAL_SAFE(&periph_spinlock);
#endif #endif
} }
#endif
#if CONFIG_ESP32_WIFI_ENABLED
void wifi_module_enable(void) void wifi_module_enable(void)
{ {
#if SOC_MODEM_CLOCK_IS_INDEPENDENT #if SOC_MODEM_CLOCK_IS_INDEPENDENT

2
components/esp_phy/CMakeLists.txt
View File

@ -15,7 +15,7 @@ else()
set(ldfragments "linker.lf") set(ldfragments "linker.lf")
endif() endif()
if(IDF_TARGET STREQUAL "esp32h4") if(CONFIG_SOC_IEEE802154_BLE_ONLY)
list(APPEND srcs "src/phy_init_esp32hxx.c") list(APPEND srcs "src/phy_init_esp32hxx.c")
else() else()
list(APPEND srcs "src/phy_init.c") list(APPEND srcs "src/phy_init.c")

4
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@ -7,6 +7,10 @@ config SOC_IEEE802154_SUPPORTED
bool bool
default y default y
config SOC_IEEE802154_BLE_ONLY
bool
default y
config SOC_EFUSE_KEY_PURPOSE_FIELD config SOC_EFUSE_KEY_PURPOSE_FIELD
bool bool
default y default y

1
components/soc/esp32h2/include/soc/soc_caps.h
View File

@ -33,6 +33,7 @@
// #define SOC_TWAI_SUPPORTED 1 // TODO: IDF-6217 // #define SOC_TWAI_SUPPORTED 1 // TODO: IDF-6217
// #define SOC_BT_SUPPORTED 1 // TODO: IDF-6416 // #define SOC_BT_SUPPORTED 1 // TODO: IDF-6416
#define SOC_IEEE802154_SUPPORTED 1 #define SOC_IEEE802154_SUPPORTED 1
#define SOC_IEEE802154_BLE_ONLY 1
// #define SOC_ASYNC_MEMCPY_SUPPORTED 1 // TODO: IDF-6238 // #define SOC_ASYNC_MEMCPY_SUPPORTED 1 // TODO: IDF-6238
// #define SOC_USB_SERIAL_JTAG_SUPPORTED 1 // TODO: IDF-6239 // #define SOC_USB_SERIAL_JTAG_SUPPORTED 1 // TODO: IDF-6239
// #define SOC_TEMP_SENSOR_SUPPORTED 1 // TODO: IDF-6229 // #define SOC_TEMP_SENSOR_SUPPORTED 1 // TODO: IDF-6229

4
components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
View File

@ -27,6 +27,10 @@ config SOC_IEEE802154_SUPPORTED
bool bool
default y default y
config SOC_IEEE802154_BLE_ONLY
bool
default y
config SOC_ASYNC_MEMCPY_SUPPORTED config SOC_ASYNC_MEMCPY_SUPPORTED
bool bool
default y default y

1
components/soc/esp32h4/include/soc/soc_caps.h
View File

@ -39,6 +39,7 @@
#define SOC_TWAI_SUPPORTED 1 #define SOC_TWAI_SUPPORTED 1
#define SOC_BT_SUPPORTED 1 #define SOC_BT_SUPPORTED 1
#define SOC_IEEE802154_SUPPORTED 1 #define SOC_IEEE802154_SUPPORTED 1
#define SOC_IEEE802154_BLE_ONLY 1
#define SOC_ASYNC_MEMCPY_SUPPORTED 1 #define SOC_ASYNC_MEMCPY_SUPPORTED 1
#define SOC_USB_SERIAL_JTAG_SUPPORTED 1 #define SOC_USB_SERIAL_JTAG_SUPPORTED 1
#define SOC_SUPPORTS_SECURE_DL_MODE 1 #define SOC_SUPPORTS_SECURE_DL_MODE 1