Merge branch 'feature/add_phy_reg_default' into 'release/v3.0'

feat: Add phy reg default when boot See merge request sdk/ESP8266_RTOS_SDK!690
espressif · Dec 29, 2018 · f561b36 · f561b36
2 parents 597bc97 + 09a5a0f
commit f561b36
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/components/bootloader/subproject/main/component.mk b/components/bootloader/subproject/main/component.mk
@@ -10,6 +10,6 @@ LINKER_SCRIPTS := \
 	$(IDF_PATH)/components/esp8266/ld/esp8266.rom.ld \
 	esp8266.bootloader.rom.ld
 
-COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH) $(addprefix -T ,$(LINKER_SCRIPTS))
+COMPONENT_ADD_LDFLAGS += -L $(IDF_PATH)/components/esp8266/lib -lcore -L $(COMPONENT_PATH) $(addprefix -T ,$(LINKER_SCRIPTS))
 
 COMPONENT_ADD_LINKER_DEPS := $(LINKER_SCRIPTS)
diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c
@@ -623,6 +623,9 @@ static esp_err_t bootloader_main()
 
     ESP_LOGI(TAG, "compile time " __TIME__ );
 
+    extern void phy_reg_default(void);
+    phy_reg_default();
+
     print_flash_info(&fhdr);
 
     update_flash_config(&fhdr);

diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
@@ -1,6 +1,6 @@
 gwen:
     crypto:     8943c89
-    core:       254ecc9
+    core:       64146c3
     net80211:   bbfcc40
     pp:         2f7b347
     smartconfig:  2.8.0

diff --git a/components/esp8266/lib/libcore.a b/components/esp8266/lib/libcore.a