Merge branch 'bugfix/fix_compile_script_global_varible_error_v3.1' in…

…to 'release/v3.1' Fix compile script global varible error (backport v3.1) See merge request sdk/ESP8266_RTOS_SDK!759
espressif · Jan 30, 2019 · db1b044 · db1b044
2 parents b4e5477 + 5ec5f53
commit db1b044
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/components/esp8266/Makefile.projbuild b/components/esp8266/Makefile.projbuild
@@ -91,8 +91,13 @@ OTA2_BIN := ./build/$(PROJECT_NAME).app2.bin
 
 OTA_V2_TO_V3_BIN  := ./build/$(PROJECT_NAME).v2_to_v3.ota.bin
 
-CONFIG_APP2_OFFSET ?= $(CONFIG_APP1_OFFSET)
-CONFIG_APP2_SIZE ?= $(CONFIG_APP1_SIZE)
+ifndef CONFIG_APP2_OFFSET
+CONFIG_APP2_OFFSET := $(CONFIG_APP1_OFFSET)
+endif
+
+ifndef CONFIG_APP2_SIZE
+CONFIG_APP2_SIZE := $(CONFIG_APP1_SIZE)
+endif
 
 OTA1_OFFSET := $(CONFIG_APP1_OFFSET)
 ifdef CONFIG_ESP8266_BOOT_COPY_APP