Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_compile_script_global_varible_error_v3.1' in…
Browse files Browse the repository at this point in the history
…to 'release/v3.1'

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

See merge request sdk/ESP8266_RTOS_SDK!759
  • Loading branch information
donghengqaz committed Jan 30, 2019
2 parents b4e5477 + 5ec5f53 commit db1b044
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions components/esp8266/Makefile.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit db1b044

Please sign in to comment.