Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit db1b044

Browse files
donghengqazdonghengqaz
committed
Merge branch 'bugfix/fix_compile_script_global_varible_error_v3.1' into 'release/v3.1'
Fix compile script global varible error (backport v3.1) See merge request sdk/ESP8266_RTOS_SDK!759
2 parents b4e5477 + 5ec5f53 commit db1b044

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

‎components/esp8266/Makefile.projbuild‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,13 @@ OTA2_BIN := ./build/$(PROJECT_NAME).app2.bin
9191

9292
OTA_V2_TO_V3_BIN := ./build/$(PROJECT_NAME).v2_to_v3.ota.bin
9393

94-
CONFIG_APP2_OFFSET ?= $(CONFIG_APP1_OFFSET)
95-
CONFIG_APP2_SIZE ?= $(CONFIG_APP1_SIZE)
94+
ifndef CONFIG_APP2_OFFSET
95+
CONFIG_APP2_OFFSET := $(CONFIG_APP1_OFFSET)
96+
endif
97+
98+
ifndef CONFIG_APP2_SIZE
99+
CONFIG_APP2_SIZE := $(CONFIG_APP1_SIZE)
100+
endif
96101

97102
OTA1_OFFSET := $(CONFIG_APP1_OFFSET)
98103
ifdef CONFIG_ESP8266_BOOT_COPY_APP

0 commit comments

Comments
 (0)