espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-04 12:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_compile_script_global_varible_error_v3.1' into 'release/v3.1'

Browse Source 
Fix compile script global varible error (backport v3.1)

See merge request sdk/ESP8266_RTOS_SDK!759
This commit is contained in:
Dong Heng
2019-01-30 17:27:12 +08:00
parent b4e54776f4 5ec5f5321f
commit db1b044312
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp8266/Makefile.projbuild
View File

@ -91,8 +91,13 @@ OTA2_BIN := ./build/$(PROJECT_NAME).app2.bin
OTA_V2_TO_V3_BIN := ./build/$(PROJECT_NAME).v2_to_v3.ota.bin OTA_V2_TO_V3_BIN := ./build/$(PROJECT_NAME).v2_to_v3.ota.bin
CONFIG_APP2_OFFSET ?= $(CONFIG_APP1_OFFSET) ifndef CONFIG_APP2_OFFSET
CONFIG_APP2_SIZE ?= $(CONFIG_APP1_SIZE) CONFIG_APP2_OFFSET := $(CONFIG_APP1_OFFSET)
endif
ifndef CONFIG_APP2_SIZE
CONFIG_APP2_SIZE := $(CONFIG_APP1_SIZE)
endif
OTA1_OFFSET := $(CONFIG_APP1_OFFSET) OTA1_OFFSET := $(CONFIG_APP1_OFFSET)
ifdef CONFIG_ESP8266_BOOT_COPY_APP ifdef CONFIG_ESP8266_BOOT_COPY_APP