Skip to content

Commit f561b36

Browse files
committed
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
2 parents 597bc97 + 09a5a0f commit f561b36

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

components/bootloader/subproject/main/component.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ LINKER_SCRIPTS := \
1010
$(IDF_PATH)/components/esp8266/ld/esp8266.rom.ld \
1111
esp8266.bootloader.rom.ld
1212

13-
COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH) $(addprefix -T ,$(LINKER_SCRIPTS))
13+
COMPONENT_ADD_LDFLAGS += -L $(IDF_PATH)/components/esp8266/lib -lcore -L $(COMPONENT_PATH) $(addprefix -T ,$(LINKER_SCRIPTS))
1414

1515
COMPONENT_ADD_LINKER_DEPS := $(LINKER_SCRIPTS)

components/bootloader_support/src/bootloader_init.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,9 @@ static esp_err_t bootloader_main()
623623

624624
ESP_LOGI(TAG, "compile time " __TIME__ );
625625

626+
extern void phy_reg_default(void);
627+
phy_reg_default();
628+
626629
print_flash_info(&fhdr);
627630

628631
update_flash_config(&fhdr);

components/esp8266/lib/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
gwen:
22
crypto: 8943c89
3-
core: 254ecc9
3+
core: 64146c3
44
net80211: bbfcc40
55
pp: 2f7b347
66
smartconfig: 2.8.0

components/esp8266/lib/libcore.a

1.16 KB
Binary file not shown.

0 commit comments

Comments
 (0)