summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Lloyd <j.nevercast@gmail.com>2019-10-11 10:52:07 +1300
committerDamien George <damien.p.george@gmail.com>2019-10-18 13:42:24 +1100
commit59c1b7d4b8fb1d441f9322976582c8709f01dfbe (patch)
treeae707265127226bd131c7e0f1edfa192a2588f13
parent25a228af7e5809fe3a582f665c13a2d38eb5ed40 (diff)
esp32/boards: Split out CPU frequency config, make 160MHz the default.
Remove the 240MHz CPU config option from sdkconfig.base and create a new sdkconfig.240mhz file for those boards that want to use 240MHz on boot. The default CPU frequency is now 160MHz (was 240MHz), to align with the ESP IDF and support more boards (eg those with D2WD chips). Fixes issue #5169.
-rw-r--r--ports/esp32/boards/TINYPICO/mpconfigboard.mk1
-rw-r--r--ports/esp32/boards/sdkconfig.240mhz5
-rw-r--r--ports/esp32/boards/sdkconfig.base1
3 files changed, 6 insertions, 1 deletions
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.mk b/ports/esp32/boards/TINYPICO/mpconfigboard.mk
index 2efdba0f3..485b3f165 100644
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.mk
+++ b/ports/esp32/boards/TINYPICO/mpconfigboard.mk
@@ -1,5 +1,6 @@
FLASH_FREQ = 80m
SDKCONFIG += boards/sdkconfig.base
+SDKCONFIG += boards/sdkconfig.240mhz
SDKCONFIG += boards/sdkconfig.spiram
SDKCONFIG += boards/TINYPICO/sdkconfig.board
diff --git a/ports/esp32/boards/sdkconfig.240mhz b/ports/esp32/boards/sdkconfig.240mhz
new file mode 100644
index 000000000..a0cb113a4
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.240mhz
@@ -0,0 +1,5 @@
+# MicroPython on ESP32, ESP IDF configuration with 240MHz CPU
+CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
+CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 \ No newline at end of file
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index a11c9397f..9348f4063 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -11,7 +11,6 @@ CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
# ESP32-specific
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
CONFIG_ESP32_XTAL_FREQ_AUTO=y