From 669e85758c7e8fe78135a3a5a788de2be60ed87f Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <git@j0h.nl>
Date: Fri, 2 Sep 2016 12:29:01 +0800
Subject: [PATCH] Add flash freq selection to menuconfig

---
 components/esptool_py/Kconfig.projbuild  | 24 ++++++++++++++++++++++++
 components/esptool_py/Makefile.projbuild |  5 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild
index 24b4e5cfe0..958911cb88 100644
--- a/components/esptool_py/Kconfig.projbuild
+++ b/components/esptool_py/Kconfig.projbuild
@@ -70,4 +70,28 @@ config ESPTOOLPY_FLASHMODE
 	default "dio" if ESPTOOLPY_FLASHMODE_DIO
 	default "dout" if ESPTOOLPY_FLASHMODE_DOUT
 
+
+choice ESPTOOLPY_FLASHFREQ
+	prompt "Flash SPI speed"
+	default ESPTOOLPY_FLASHFREQ_40M
+	help
+		The SPI flash frequency to be used.
+
+config ESPTOOLPY_FLASHFREQ_80M
+	bool "80 MHz"
+config ESPTOOLPY_FLASHFREQ_40M
+	bool "40 MHz"
+config ESPTOOLPY_FLASHFREQ_26M
+	bool "26 MHz"
+config ESPTOOLPY_FLASHFREQ_20M
+	bool "20 MHz"
+endchoice
+
+config ESPTOOLPY_FLASHFREQ
+	string
+	default "80m" if ESPTOOLPY_FLASHFREQ_80M
+	default "40m" if ESPTOOLPY_FLASHFREQ_40M
+	default "26m" if ESPTOOLPY_FLASHFREQ_26M
+	default "20m" if ESPTOOLPY_FLASHFREQ_20M
+
 endmenu
diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild
index b9bdfb4df9..9ec51d8961 100644
--- a/components/esptool_py/Makefile.projbuild
+++ b/components/esptool_py/Makefile.projbuild
@@ -3,6 +3,7 @@
 ESPPORT ?= $(CONFIG_ESPTOOLPY_PORT)
 ESPBAUD ?= $(CONFIG_ESPTOOLPY_BAUD)
 ESPFLASHMODE ?= $(CONFIG_ESPTOOLPY_FLASHMODE)
+ESPFLASHFREQ ?= $(CONFIG_ESPTOOLPY_FLASHFREQ)
 
 PYTHON ?= $(call dequote,$(CONFIG_PYTHON))
 
@@ -13,12 +14,12 @@ PYTHON ?= $(call dequote,$(CONFIG_PYTHON))
 ESPTOOLPY := $(PYTHON) $(IDF_PATH)/bin/esptool.py --chip esp32
 ESPTOOLPY_SERIAL := $(ESPTOOLPY) --port $(ESPPORT) --baud $(ESPBAUD)
 
-ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z) --flash_mode $(ESPFLASHMODE)
+ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z) --flash_mode $(ESPFLASHMODE) --flash_freq $(ESPFLASHFREQ)
 
 ESPTOOL_ALL_FLASH_ARGS += $(CONFIG_APP_OFFSET) $(APP_BIN)
 
 $(APP_BIN): $(APP_ELF)
-	$(Q) $(ESPTOOLPY) elf2image --flash_mode $(ESPFLASHMODE) -o $@ $<
+	$(Q) $(ESPTOOLPY) elf2image --flash_mode $(ESPFLASHMODE) --flash_freq $(ESPFLASHFREQ) -o $@ $<
 
 flash: all_binaries
 	@echo "Flashing project app to $(CONFIG_APP_OFFSET)..."