espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_esp32c3_macaddr_default_v4.3' into 'release/v4.3'

Browse Source 
fix esp32c3 default mac addr count(v4.3)

See merge request espressif/esp-idf!13209
This commit is contained in:
Jiang Jiang Jian
2021-04-21 11:35:43 +00:00
parent 5580d578bd a17b57b062
commit 5a5327e77e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/esp32c3/Kconfig
View File

@ -50,7 +50,7 @@ menu "ESP32C3-Specific"
choice ESP32C3_UNIVERSAL_MAC_ADDRESSES choice ESP32C3_UNIVERSAL_MAC_ADDRESSES
bool "Number of universally administered (by IEEE) MAC address" bool "Number of universally administered (by IEEE) MAC address"
default ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO default ESP32C3_UNIVERSAL_MAC_ADDRESSES_FOUR
help help
Configure the number of universally administered (by IEEE) MAC addresses. Configure the number of universally administered (by IEEE) MAC addresses.
During initialization, MAC addresses for each network interface are generated or derived from a During initialization, MAC addresses for each network interface are generated or derived from a
@ -69,21 +69,22 @@ menu "ESP32C3-Specific"
bool "Two" bool "Two"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_BT select ESP_MAC_ADDR_UNIVERSE_BT
config ESP32C3_UNIVERSAL_MAC_ADDRESSES_THREE config ESP32C3_UNIVERSAL_MAC_ADDRESSES_FOUR
bool "Three" bool "Four"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_WIFI_AP select ESP_MAC_ADDR_UNIVERSE_WIFI_AP
select ESP_MAC_ADDR_UNIVERSE_BT select ESP_MAC_ADDR_UNIVERSE_BT
select ESP_MAC_ADDR_UNIVERSE_ETH
endchoice endchoice
config ESP32C3_UNIVERSAL_MAC_ADDRESSES config ESP32C3_UNIVERSAL_MAC_ADDRESSES
int int
default 2 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO default 2 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO
default 3 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_THREE default 4 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_FOUR
config ESP_MAC_ADDR_UNIVERSE_BT_OFFSET config ESP_MAC_ADDR_UNIVERSE_BT_OFFSET
int int
default 2 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_THREE default 2 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_FOUR
default 1 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO default 1 if ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO
config ESP32C3_DEBUG_OCDAWARE config ESP32C3_DEBUG_OCDAWARE