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

Merge branch 'feature/only_support_2MB+_flash_in_menuconfig' into 'master'

Browse Source 
feat(esp8266): Only support 2MB+ spi flash in menuconfig

See merge request sdk/ESP8266_RTOS_SDK!212
This commit is contained in:
Wu Jian Gang
2018-06-02 21:20:22 +08:00
parent a7651b2996 797811a626
commit 5ce23a7039
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp8266/component.mk
View File

@ -11,13 +11,6 @@ LIBS += airkiss crypto espnow gcc hal core net80211 \
phy pp pwm smartconfig ssc wpa wps phy pp pwm smartconfig ssc wpa wps
endif endif
ifeq ($(CONFIG_ESPTOOLPY_APP_NUM),"app1")
BIN_APP_NUM := app1
endif
ifeq ($(CONFIG_ESPTOOLPY_APP_NUM),"app2")
BIN_APP_NUM := app2
endif
#Linker scripts used to link the final application. #Linker scripts used to link the final application.
#Warning: These linker scripts are only used when the normal app is compiled; the bootloader #Warning: These linker scripts are only used when the normal app is compiled; the bootloader
#specifies its own scripts. #specifies its own scripts.

35
components/esptool_py/Kconfig.projbuild
View File

@ -99,22 +99,14 @@ config ESPTOOLPY_FLASHFREQ
choice ESPTOOLPY_FLASHSIZE choice ESPTOOLPY_FLASHSIZE
prompt "Flash size" prompt "Flash size"
default ESPTOOLPY_FLASHSIZE_2MB default ESPTOOLPY_FLASHSIZE_2MB_C1
help help
SPI flash size, in megabytes SPI flash size, in megabytes
config ESPTOOLPY_FLASHSIZE_512KB
bool "512 KB"
config ESPTOOLPY_FLASHSIZE_1MB
bool "1 MB"
config ESPTOOLPY_FLASHSIZE_2MB
bool "2 MB"
config ESPTOOLPY_FLASHSIZE_2MB_C1 config ESPTOOLPY_FLASHSIZE_2MB_C1
bool "2 MB - C1" bool "2 MB"
config ESPTOOLPY_FLASHSIZE_4MB
bool "4 MB"
config ESPTOOLPY_FLASHSIZE_4MB_C1 config ESPTOOLPY_FLASHSIZE_4MB_C1
bool "4 MB - C1" bool "4 MB"
config ESPTOOLPY_FLASHSIZE_8MB config ESPTOOLPY_FLASHSIZE_8MB
bool "8 MB" bool "8 MB"
config ESPTOOLPY_FLASHSIZE_16MB config ESPTOOLPY_FLASHSIZE_16MB
@ -123,32 +115,11 @@ endchoice
config ESPTOOLPY_FLASHSIZE config ESPTOOLPY_FLASHSIZE
string string
default "512KB" if ESPTOOLPY_FLASHSIZE_512KB
default "1MB" if ESPTOOLPY_FLASHSIZE_1MB
default "2MB" if ESPTOOLPY_FLASHSIZE_2MB
default "2MB-c1" if ESPTOOLPY_FLASHSIZE_2MB_C1 default "2MB-c1" if ESPTOOLPY_FLASHSIZE_2MB_C1
default "4MB" if ESPTOOLPY_FLASHSIZE_4MB
default "4MB-c1" if ESPTOOLPY_FLASHSIZE_4MB_C1 default "4MB-c1" if ESPTOOLPY_FLASHSIZE_4MB_C1
default "8MB" if ESPTOOLPY_FLASHSIZE_8MB default "8MB" if ESPTOOLPY_FLASHSIZE_8MB
default "16MB" if ESPTOOLPY_FLASHSIZE_16MB default "16MB" if ESPTOOLPY_FLASHSIZE_16MB
choice ESPTOOLPY_APP_NUM
prompt "APP bin number"
default ESPTOOLPY_APP_NUM_APP1
help
Select APP bin number(app1 or app2)
config ESPTOOLPY_APP_NUM_APP1
bool "app1"
config ESPTOOLPY_APP_NUM_APP2
bool "app2"
endchoice
config ESPTOOLPY_APP_NUM
string
default "app1" if ESPTOOLPY_APP_NUM_APP1
default "app2" if ESPTOOLPY_APP_NUM_APP2
choice ESPTOOLPY_BEFORE choice ESPTOOLPY_BEFORE
prompt "Before flashing" prompt "Before flashing"
default ESPTOOLPY_BEFORE_RESET default ESPTOOLPY_BEFORE_RESET