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

Merge branch 'feature/boot_copy_app_use_without_depend' into 'master'

Browse Source 
Boot copy OTA is not depend on others

See merge request
This commit is contained in:
Dong Heng
2019-01-24 19:41:02 +08:00
parent e634398421 04c731c802
commit fc4e94d42d
2 changed files with 1 additions and 3 deletions
components/spi_flash
component.mk
port
port.c

2
components/spi_flash/component.mk

@ -10,9 +10,7 @@ endif
CFLAGS += -DPARTITION_QUEUE_HEADER=\"sys/queue.h\" CFLAGS += -DPARTITION_QUEUE_HEADER=\"sys/queue.h\"
ifdef CONFIG_ESP8266_OTA_FROM_OLD
ifdef IS_BOOTLOADER_BUILD ifdef IS_BOOTLOADER_BUILD
COMPONENT_SRCDIRS += port COMPONENT_SRCDIRS += port
COMPONENT_OBJS += port/port.o COMPONENT_OBJS += port/port.o
endif endif
endif

2
components/spi_flash/port/port.c

@ -14,7 +14,7 @@
#include "sdkconfig.h" #include "sdkconfig.h"
#if defined(CONFIG_ESP8266_OTA_FROM_OLD) && defined(BOOTLOADER_BUILD) #if (defined(CONFIG_ESP8266_OTA_FROM_OLD) || defined(CONFIG_ESP8266_BOOT_COPY_APP)) && defined(BOOTLOADER_BUILD)
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>