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

phyinit: Use PHY config to enable, don't need phy_get_romfunc_addr to init

Browse Source
This commit is contained in:
Angus Gratton 2017-01-19 11:18:44 +11:00
parent efbd2805e2
commit 9a8a82e857
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp32/component.mk
View File

@ -3,16 +3,14 @@
# #
COMPONENT_SRCDIRS := . hwcrypto COMPONENT_SRCDIRS := . hwcrypto
LIBS := core rtc phy LIBS := core rtc
ifdef CONFIG_BT_ENABLED ifdef CONFIG_PHY_ENABLED # BT || WIFI
LIBS += coexist LIBS += phy coexist
endif endif
ifdef CONFIG_WIFI_ENABLED ifdef CONFIG_WIFI_ENABLED
LIBS += net80211 pp wpa smartconfig coexist wps wpa2 LIBS += net80211 pp wpa smartconfig coexist wps wpa2
endif endif
LIBS := $(sort $(LIBS)) # de-duplicate, we can handle different orders here
LINKER_SCRIPTS += esp32.common.ld esp32.rom.ld esp32.peripherals.ld LINKER_SCRIPTS += esp32.common.ld esp32.rom.ld esp32.peripherals.ld
ifeq ("$(CONFIG_NEWLIB_NANO_FORMAT)","y") ifeq ("$(CONFIG_NEWLIB_NANO_FORMAT)","y")

2
components/esp32/cpu_freq.c
View File

@ -17,7 +17,6 @@
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "rom/uart.h" #include "rom/uart.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#include "phy.h"
#include "rtc.h" #include "rtc.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
@ -32,7 +31,6 @@
void esp_set_cpu_freq(void) void esp_set_cpu_freq(void)
{ {
uint32_t freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ; uint32_t freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
phy_get_romfunc_addr();
// freq will be changed to 40MHz in rtc_init_lite, // freq will be changed to 40MHz in rtc_init_lite,
// wait uart tx finish, otherwise some uart output will be lost // wait uart tx finish, otherwise some uart output will be lost

3
components/esp32/phy.h
View File

@ -25,8 +25,7 @@ extern "C" {
*/ */
/** /**
* @brief Initialize function pointer table in PHY library. * @brief Return ROM function pointer table from PHY library.
* @note This function should be called before register_chipv7_phy.
*/ */
void phy_get_romfunc_addr(void); void phy_get_romfunc_addr(void);

7
components/esp32/phy_init.c
View File

@ -27,7 +27,7 @@
#include "nvs.h" #include "nvs.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#ifdef CONFIG_WIFI_ENABLED #ifdef CONFIG_PHY_ENABLED
#include "phy.h" #include "phy.h"
#include "phy_init_data.h" #include "phy_init_data.h"
@ -39,8 +39,7 @@ esp_err_t esp_phy_init(const esp_phy_init_data_t* init_data,
{ {
assert(init_data); assert(init_data);
assert(calibration_data); assert(calibration_data);
// Initialize PHY pointer table
phy_get_romfunc_addr();
REG_SET_BIT(DPORT_CORE_RST_EN_REG, DPORT_MAC_RST); REG_SET_BIT(DPORT_CORE_RST_EN_REG, DPORT_MAC_RST);
REG_CLR_BIT(DPORT_CORE_RST_EN_REG, DPORT_MAC_RST); REG_CLR_BIT(DPORT_CORE_RST_EN_REG, DPORT_MAC_RST);
// Enable WiFi peripheral clock // Enable WiFi peripheral clock
@ -221,4 +220,4 @@ static esp_err_t store_cal_data_to_nvs_handle(nvs_handle handle,
return err; return err;
} }
#endif // CONFIG_WIFI_ENABLED #endif // CONFIG_PHY_ENABLED