From 797811a62666306ef96ef651caef6a999d8100c2 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 1 Jun 2018 15:11:15 +0800 Subject: [PATCH] feat(esp8266): Only support 2MB+ spi flash in menuconfig Default config is 2MB(1024KB + 1024KB) --- components/esp8266/component.mk | 7 ----- components/esptool_py/Kconfig.projbuild | 35 +++---------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/components/esp8266/component.mk b/components/esp8266/component.mk index 449a95c9..82b29bcd 100644 --- a/components/esp8266/component.mk +++ b/components/esp8266/component.mk @@ -11,13 +11,6 @@ LIBS += airkiss crypto espnow gcc hal core net80211 \ phy pp pwm smartconfig ssc wpa wps 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. #Warning: These linker scripts are only used when the normal app is compiled; the bootloader #specifies its own scripts. diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild index 0600a6c1..10b1aa1d 100644 --- a/components/esptool_py/Kconfig.projbuild +++ b/components/esptool_py/Kconfig.projbuild @@ -99,22 +99,14 @@ config ESPTOOLPY_FLASHFREQ choice ESPTOOLPY_FLASHSIZE prompt "Flash size" - default ESPTOOLPY_FLASHSIZE_2MB + default ESPTOOLPY_FLASHSIZE_2MB_C1 help 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 - bool "2 MB - C1" -config ESPTOOLPY_FLASHSIZE_4MB - bool "4 MB" + bool "2 MB" config ESPTOOLPY_FLASHSIZE_4MB_C1 - bool "4 MB - C1" + bool "4 MB" config ESPTOOLPY_FLASHSIZE_8MB bool "8 MB" config ESPTOOLPY_FLASHSIZE_16MB @@ -123,32 +115,11 @@ endchoice config ESPTOOLPY_FLASHSIZE 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 "4MB" if ESPTOOLPY_FLASHSIZE_4MB default "4MB-c1" if ESPTOOLPY_FLASHSIZE_4MB_C1 default "8MB" if ESPTOOLPY_FLASHSIZE_8MB 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 prompt "Before flashing" default ESPTOOLPY_BEFORE_RESET