forked from espressif/esp-idf
components/esp32: add CPU frequency selection in menuconfig
Note that with WiFi stack enabled, system_init will reset frequency to 240MHz. To make this setting useful, esp32-wifi-libs submodule needs to be updated.
This commit is contained in:
committed by
Wu Jian Gang
parent
e04e6b0c7f
commit
5ab769516d
@@ -1,5 +1,25 @@
|
|||||||
menu "ESP32-specific config"
|
menu "ESP32-specific config"
|
||||||
|
|
||||||
|
choice ESP32_DEFAULT_CPU_FREQ_MHZ
|
||||||
|
prompt "CPU frequency"
|
||||||
|
default ESP32_DEFAULT_CPU_FREQ_240
|
||||||
|
help
|
||||||
|
CPU frequency to be set on application startup.
|
||||||
|
|
||||||
|
config ESP32_DEFAULT_CPU_FREQ_80
|
||||||
|
bool "80 MHz"
|
||||||
|
config ESP32_DEFAULT_CPU_FREQ_160
|
||||||
|
bool "160 MHz"
|
||||||
|
config ESP32_DEFAULT_CPU_FREQ_240
|
||||||
|
bool "240 MHz"
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
config ESP32_DEFAULT_CPU_FREQ_MHZ
|
||||||
|
int
|
||||||
|
default 80 if ESP32_DEFAULT_CPU_FREQ_80
|
||||||
|
default 160 if ESP32_DEFAULT_CPU_FREQ_160
|
||||||
|
default 240 if ESP32_DEFAULT_CPU_FREQ_240
|
||||||
|
|
||||||
config WIFI_ENABLED
|
config WIFI_ENABLED
|
||||||
bool "Enable low-level WiFi stack"
|
bool "Enable low-level WiFi stack"
|
||||||
default "y"
|
default "y"
|
||||||
|
68
components/esp32/cpu_freq.c
Normal file
68
components/esp32/cpu_freq.c
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "rom/ets_sys.h"
|
||||||
|
#include "sdkconfig.h"
|
||||||
|
|
||||||
|
typedef enum{
|
||||||
|
XTAL_40M = 40,
|
||||||
|
XTAL_26M = 26,
|
||||||
|
XTAL_24M = 24,
|
||||||
|
XTAL_AUTO = 0
|
||||||
|
} xtal_freq_t;
|
||||||
|
|
||||||
|
typedef enum{
|
||||||
|
CPU_80M = 1,
|
||||||
|
CPU_160M = 2,
|
||||||
|
CPU_240M = 3,
|
||||||
|
} cpu_freq_t;
|
||||||
|
|
||||||
|
extern void phy_get_romfunc_addr();
|
||||||
|
|
||||||
|
// TODO: these functions need to be moved from librtc to ESP-IDF
|
||||||
|
extern void rtc_init_lite();
|
||||||
|
extern void rtc_set_cpu_freq(xtal_freq_t xtal_freq, cpu_freq_t cpu_freq);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function is not exposed as an API at this point,
|
||||||
|
* because FreeRTOS doesn't yet support dynamic changing of
|
||||||
|
* CPU frequency. Also we need to implement hooks for
|
||||||
|
* components which want to be notified of CPU frequency
|
||||||
|
* changes.
|
||||||
|
*/
|
||||||
|
void esp_set_cpu_freq()
|
||||||
|
{
|
||||||
|
uint32_t freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
|
||||||
|
phy_get_romfunc_addr();
|
||||||
|
rtc_init_lite();
|
||||||
|
cpu_freq_t freq = CPU_80M;
|
||||||
|
switch(freq_mhz) {
|
||||||
|
case 240:
|
||||||
|
freq = CPU_240M;
|
||||||
|
break;
|
||||||
|
case 160:
|
||||||
|
freq = CPU_160M;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
freq_mhz = 80;
|
||||||
|
/* no break */
|
||||||
|
case 80:
|
||||||
|
freq = CPU_80M;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
rtc_set_cpu_freq(XTAL_AUTO, freq);
|
||||||
|
ets_update_cpu_frequency(freq_mhz);
|
||||||
|
}
|
||||||
|
|
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include "soc/dport_reg.h"
|
#include "soc/dport_reg.h"
|
||||||
#include "soc/io_mux_reg.h"
|
#include "soc/io_mux_reg.h"
|
||||||
|
#include "soc/cpu.h"
|
||||||
|
|
||||||
#include "freertos/FreeRTOS.h"
|
#include "freertos/FreeRTOS.h"
|
||||||
#include "freertos/task.h"
|
#include "freertos/task.h"
|
||||||
@@ -201,6 +202,8 @@ static void do_global_ctors(void) {
|
|||||||
extern esp_err_t app_main(void *ctx);
|
extern esp_err_t app_main(void *ctx);
|
||||||
|
|
||||||
void user_start_cpu0(void) {
|
void user_start_cpu0(void) {
|
||||||
|
esp_set_cpu_freq(); // set CPU frequency configured in menuconfig
|
||||||
|
uart_div_modify(0, (80000000 << 4) / 115200);
|
||||||
ets_setup_syscalls();
|
ets_setup_syscalls();
|
||||||
do_global_ctors();
|
do_global_ctors();
|
||||||
esp_ipc_init();
|
esp_ipc_init();
|
||||||
|
@@ -33,4 +33,14 @@ static inline bool cpu_in_interrupt_context(void)
|
|||||||
return (ps & PS_UM) == 0;
|
return (ps & PS_UM) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @brief Set CPU frequency to the value defined in menuconfig
|
||||||
|
*
|
||||||
|
* Called from cpu_start.c, not intended to be called from other places.
|
||||||
|
* This is a temporary function which will be replaced once dynamic
|
||||||
|
* CPU frequency changing is implemented.
|
||||||
|
*/
|
||||||
|
void esp_set_cpu_freq();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -100,7 +100,7 @@
|
|||||||
#define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1
|
#define configTHREAD_LOCAL_STORAGE_DELETE_CALLBACKS 1
|
||||||
|
|
||||||
/* TODO: config freq by menuconfig */
|
/* TODO: config freq by menuconfig */
|
||||||
#define XT_CLOCK_FREQ 80000000
|
#define XT_CLOCK_FREQ (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
|
||||||
|
|
||||||
/* Required for configuration-dependent settings */
|
/* Required for configuration-dependent settings */
|
||||||
#include "xtensa_config.h"
|
#include "xtensa_config.h"
|
||||||
|
Reference in New Issue
Block a user