Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/deep_sleep_wake_stub' into 'master'

Browse source 
esp32: Bootloader wake deep sleep stub

App can contain a stub program resident in RTC fast memory. Bootloader
will load the stub on initial boot. If the device wakes from deep sleep,
the stub is run immediately (before any other data is loaded, etc.)

To implement a custom wake stub, implement a function in your program:

```
void RTC_IRAM_ATTR esp_wake_deep_sleep(void)
{
  esp_default_wake_deep_sleep();
  // other wake logic
}
```

... and it will replace the default implementation.

See merge request !78
This commit is contained in:
Wu Jian Gang 2016-09-29 18:07:16 +08:00
parent c2a037fcbd 4e092be6d6
commit 702e749667
21 changed files with 537 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Kconfig
View file

@ -7,18 +7,18 @@ mainmenu "Espressif IoT Development Framework Configuration"
menu "SDK tool configuration" menu "SDK tool configuration"
config TOOLPREFIX config TOOLPREFIX
string "Compiler toolchain path/prefix" string "Compiler toolchain path/prefix"
default "xtensa-esp32-elf-" default "xtensa-esp32-elf-"
help help
The prefix/path that is used to call the toolchain. The default setting assumes The prefix/path that is used to call the toolchain. The default setting assumes
a crosstool-ng gcc setup that is in your PATH. a crosstool-ng gcc setup that is in your PATH.
config PYTHON config PYTHON
string "Python 2 interpreter" string "Python 2 interpreter"
default "python" default "python"
help help
The executable name/path that is used to run python. On some systems Python 2.x The executable name/path that is used to run python. On some systems Python 2.x
may need to be invoked as python2. may need to be invoked as python2.
endmenu endmenu
source "$COMPONENT_KCONFIGS_PROJBUILD" source "$COMPONENT_KCONFIGS_PROJBUILD"

4
components/bootloader/src/main/bootloader_config.h
View file

@ -30,6 +30,10 @@ extern "C"
#define IROM_HIGH 0x40400000 #define IROM_HIGH 0x40400000
#define DROM_LOW 0x3F400000 #define DROM_LOW 0x3F400000
#define DROM_HIGH 0x3F800000 #define DROM_HIGH 0x3F800000
#define RTC_IRAM_LOW 0x400C0000
#define RTC_IRAM_HIGH 0x400C2000
#define RTC_DATA_LOW 0x50000000
#define RTC_DATA_HIGH 0x50002000
/*spi mode,saved in third byte in flash */ /*spi mode,saved in third byte in flash */
enum { enum {

26
components/bootloader/src/main/bootloader_start.c
View file

@ -22,6 +22,7 @@
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "rom/spi_flash.h" #include "rom/spi_flash.h"
#include "rom/crc.h" #include "rom/crc.h"
#include "rom/rtc.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/cpu.h" #include "soc/cpu.h"
@ -362,11 +363,15 @@ void unpack_load_app(const partition_pos_t* partition)
uint32_t irom_load_addr = 0; uint32_t irom_load_addr = 0;
uint32_t irom_size = 0; uint32_t irom_size = 0;
/* Reload the RTC memory sections whenever a non-deepsleep reset
is occuring */
bool load_rtc_memory = rtc_get_reset_reason(0) != DEEPSLEEP_RESET;
ESP_LOGD(TAG, "bin_header: %u %u %u %u %08x", image_header.magic, ESP_LOGD(TAG, "bin_header: %u %u %u %u %08x", image_header.magic,
image_header.blocks, image_header.blocks,
image_header.spi_mode, image_header.spi_mode,
image_header.spi_size, image_header.spi_size,
(unsigned)image_header.entry_addr); (unsigned)image_header.entry_addr);
for (uint32_t section_index = 0; for (uint32_t section_index = 0;
section_index < image_header.blocks; section_index < image_header.blocks;
@ -406,7 +411,18 @@ void unpack_load_app(const partition_pos_t* partition)
map = true; map = true;
} }
ESP_LOGI(TAG, "section %d: paddr=0x%08x vaddr=0x%08x size=0x%05x (%6d) %s", section_index, pos, section_header.load_addr, section_header.data_len, section_header.data_len, (load)?"load":(map)?"map":""); if(!load_rtc_memory && address >= RTC_IRAM_LOW && address < RTC_IRAM_HIGH) {
ESP_LOGD(TAG, "Skipping RTC code section at %08x\n", pos);
load = false;
}
if(!load_rtc_memory && address >= RTC_DATA_LOW && address < RTC_DATA_HIGH) {
ESP_LOGD(TAG, "Skipping RTC data section at %08x\n", pos);
load = false;
}
ESP_LOGI(TAG, "section %d: paddr=0x%08x vaddr=0x%08x size=0x%05x (%6d) %s", section_index, pos,
section_header.load_addr, section_header.data_len, section_header.data_len, (load)?"load":(map)?"map":"");
if (!load) { if (!load) {
pos += section_header.data_len; pos += section_header.data_len;

30
components/bt/Kconfig
View file

@ -3,21 +3,27 @@ visible if MEMMAP_BT
config BT_ENABLED config BT_ENABLED
bool bool
depends on ESP32_ENABLE_STACK_BT depends on ESP32_ENABLE_STACK_BT
help help
This compiles in the low-level BT stack. This compiles in the low-level BT stack.
#config BT_BTLE #config BT_BTLE
# bool "Enable BTLE" # bool "Enable BTLE"
# depends on BT_ENABLED # depends on BT_ENABLED
# help # help
# This compiles BTLE support # This compiles BTLE support
# #
#config BT_BT #config BT_BT
# bool "Enable classic BT" # bool "Enable classic BT"
# depends on BT_ENABLED # depends on BT_ENABLED
# help # help
# This enables classic BT support # This enables classic BT support
endmenu endmenu
# Memory reserved at start of DRAM for Bluetooth stack
config BT_RESERVE_DRAM
hex
default 0x10000 if MEMMAP_BT
default 0

48
components/esp32/Kconfig
View file

@ -63,6 +63,12 @@ config MEMMAP_TRACEMEM
of memory that can't be used for general purposes anymore. Disable this if you do not know of memory that can't be used for general purposes anymore. Disable this if you do not know
what this is. what this is.
# Memory to reverse for trace, used in linker script
config TRACEMEM_RESERVE_DRAM
hex
default 0x8000 if MEMMAP_TRACEMEM
default 0x0
config MEMMAP_SPISRAM config MEMMAP_SPISRAM
bool "Use external SPI SRAM chip as main memory" bool "Use external SPI SRAM chip as main memory"
default "n" default "n"
@ -78,7 +84,7 @@ config WIFI_ENABLED
help help
This compiles in the low-level WiFi stack. This compiles in the low-level WiFi stack.
Temporarily, this option is not compatible with BT stack. Temporarily, this option is not compatible with BT stack.
config SYSTEM_EVENT_QUEUE_SIZE config SYSTEM_EVENT_QUEUE_SIZE
int "System event queue size" int "System event queue size"
@ -101,13 +107,37 @@ config MAIN_TASK_STACK_SIZE
config NEWLIB_STDOUT_ADDCR config NEWLIB_STDOUT_ADDCR
bool "Standard-out output adds carriage return before newline" bool "Standard-out output adds carriage return before newline"
default y default y
help help
Most people are used to end their printf strings with a newline. If this Most people are used to end their printf strings with a newline. If this
is sent as is to the serial port, most terminal programs will only move the is sent as is to the serial port, most terminal programs will only move the
cursor one line down, not also move it to the beginning of the line. This cursor one line down, not also move it to the beginning of the line. This
is usually done by an added CR character. Enabling this will make the is usually done by an added CR character. Enabling this will make the
standard output code automatically add a CR character before a LF. standard output code automatically add a CR character before a LF.
config ULP_COPROC_ENABLED
bool "Enable Ultra Low Power (ULP) Coprocessor"
default "n"
help
Set to 'y' if you plan to load a firmware for the coprocessor.
If this option is enabled, further coprocessor configuration will appear in the Components menu.
config ULP_COPROC_RESERVE_MEM
int "RTC slow memory reserved for coprocessor"
default 512
range 32 8192
depends on ULP_COPROC_ENABLED
help
Bytes of memory to reserve for ULP coprocessor firmware & data.
Data is reserved at the beginning of RTC slow memory.
# Set CONFIG_ULP_COPROC_RESERVE_MEM to 0 if ULP is disabled
config ULP_COPROC_RESERVE_MEM
int
default 0
depends on !ULP_COPROC_ENABLED
endmenu endmenu

27
components/esp32/component.mk
View file

@ -12,21 +12,7 @@ COMPONENT_SRCDIRS := . hwcrypto
LIBS := crypto core net80211 phy rtc pp wpa wps LIBS := crypto core net80211 phy rtc pp wpa wps
ifeq ($(CONFIG_MEMMAP_BT),y) LINKER_SCRIPTS += -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld
ifeq ($(CONFIG_MEMMAP_TRACEMEM),y)
LINKER_SCRIPTS = -T esp32.bt.trace.ld
else
LINKER_SCRIPTS = -T esp32.bt.ld
endif
else
ifeq ($(CONFIG_MEMMAP_TRACEMEM),y)
LINKER_SCRIPTS = -T esp32.trace.ld
else
LINKER_SCRIPTS = -T esp32.ld
endif
endif
LINKER_SCRIPTS += -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld
COMPONENT_ADD_LDFLAGS := -lesp32 \ COMPONENT_ADD_LDFLAGS := -lesp32 \
$(abspath libhal.a) \ $(abspath libhal.a) \
@ -51,3 +37,14 @@ $(eval $(call SubmoduleRequiredForFiles,$(ALL_LIB_FILES)))
# It would be better for components to be able to expose any of these # It would be better for components to be able to expose any of these
# non-standard dependencies via get_variable, but this will do for now. # non-standard dependencies via get_variable, but this will do for now.
$(COMPONENT_LIBRARY): $(ALL_LIB_FILES) $(COMPONENT_LIBRARY): $(ALL_LIB_FILES)
# Preprocess esp32.ld linker script into esp32_out.ld
#
# The library doesn't really depend on esp32_out.ld, but it
# saves us from having to add the target to a Makefile.projbuild
$(COMPONENT_LIBRARY): esp32_out.ld
esp32_out.ld: $(COMPONENT_PATH)/ld/esp32.ld ../include/sdkconfig.h
$(CC) -I ../include -C -P -x c -E $< -o $@
COMPONENT_EXTRA_CLEAN := esp32_out.ld

49
components/esp32/deepsleep.c Normal file
View file

@ -0,0 +1,49 @@
/* Wake from deep sleep stub
See esp_deepsleep.h esp_wake_deep_sleep() comments for details.
*/
#include <stddef.h>
#include <sys/lock.h>
#include "rom/cache.h"
#include "rom/rtc.h"
#include "soc/rtc_cntl_reg.h"
#include "soc/dport_reg.h"
#include "esp_attr.h"
#include "esp_deepsleep.h"
/* Updating RTC_MEMORY_CRC_REG register via set_rtc_memory_crc()
is not thread-safe. */
static _lock_t lock_rtc_memory_crc;
esp_deep_sleep_wake_stub_fn_t esp_get_deep_sleep_wake_stub(void)
{
_lock_acquire(&lock_rtc_memory_crc);
uint32_t stored_crc = REG_READ(RTC_MEMORY_CRC_REG);
set_rtc_memory_crc();
uint32_t calc_crc = REG_READ(RTC_MEMORY_CRC_REG);
REG_WRITE(RTC_MEMORY_CRC_REG, stored_crc);
_lock_release(&lock_rtc_memory_crc);
if(stored_crc == calc_crc) {
return (esp_deep_sleep_wake_stub_fn_t)REG_READ(RTC_ENTRY_ADDR_REG);
} else {
return NULL;
}
}
void esp_set_deep_sleep_wake_stub(esp_deep_sleep_wake_stub_fn_t new_stub)
{
_lock_acquire(&lock_rtc_memory_crc);
REG_WRITE(RTC_ENTRY_ADDR_REG, (uint32_t)new_stub);
set_rtc_memory_crc();
_lock_release(&lock_rtc_memory_crc);
}
void RTC_IRAM_ATTR esp_default_wake_deep_sleep(void) {
//
//mmu_init(0);
REG_SET_BIT(DPORT_PRO_CACHE_CTRL1_REG, DPORT_PRO_CACHE_MMU_IA_CLR);
REG_CLR_BIT(DPORT_PRO_CACHE_CTRL1_REG, DPORT_PRO_CACHE_MMU_IA_CLR);
}
void __attribute__((weak, alias("esp_default_wake_deep_sleep"))) esp_wake_deep_sleep(void);

16
components/esp32/include/esp_attr.h
View file

@ -17,8 +17,8 @@
#define ROMFN_ATTR #define ROMFN_ATTR
//Normally, the linker script will put all code and rodata in flash, //Normally, the linker script will put all code and rodata in flash,
//and all variables in shared RAM. This can be redirected to IRAM if //and all variables in shared RAM. These macros can be used to redirect
//needed using these macros. //particular functions/variables to other memory regions.
// Forces code into IRAM instead of flash // Forces code into IRAM instead of flash
#define IRAM_ATTR __attribute__((section(".iram1"))) #define IRAM_ATTR __attribute__((section(".iram1")))
@ -26,4 +26,16 @@
// Forces data into DRAM instead of flash // Forces data into DRAM instead of flash
#define DRAM_ATTR __attribute__((section(".dram1"))) #define DRAM_ATTR __attribute__((section(".dram1")))
// Forces code into RTC fast memory
#define RTC_IRAM_ATTR __attribute__((section(".rtc.text")))
// Forces data into RTC slow memory
// Any variable marked with this attribute will keep its value
// during a deep sleep / wake cycle.
#define RTC_DATA_ATTR __attribute__((section(".rtc.data")))
// Forces read-only data into RTC slow memory
// Makes constant data available to RTC wake stubs (see esp_deepsleep.h)
#define RTC_RODATA_ATTR __attribute__((section(".rtc.rodata")))
#endif /* __ESP_ATTR_H__ */ #endif /* __ESP_ATTR_H__ */

137
components/esp32/include/esp_deepsleep.h Normal file
View file

@ -0,0 +1,137 @@
// 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.
#ifndef __ESP_DEEPSLEEP_H__
#define __ESP_DEEPSLEEP_H_
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/** \defgroup Deep_Sleep_API Deep Sleep API
* @brief API for putting device into deep sleep
*/
/** @addtogroup Deep_Sleep_API
* @{
*/
/**
* @brief Set the chip to deep-sleep mode.
*
* The device will automatically wake up after the deep-sleep time set
* by the users. Upon waking up, the device boots up from user_init.
*
* @attention The parameter time_in_us to be "uint64" is for further development.
* Only the low 32 bits of parameter time_in_us are avalable now.
*
* @param uint64 time_in_us : deep-sleep time, only the low 32bits are avalable now. unit: microsecond
*
* @return null
*/
void system_deep_sleep(uint64_t time_in_us);
/**
* @brief Default stub to run on wake from deep sleep.
*
* Allows for executing code immediately on wake from sleep, before
* the software bootloader or esp-idf app has started up.
*
* This function is weak-linked, so you can implement your own version
* to run code immediately when the chip wakes from
* sleep.
*
* For example:
* @code
* void RTC_IRAM_ATTR esp_wake_deep_sleep(void) {
* esp_default_wake_deep_sleep();
* // Add additional functionality here
* }
*
* (Implementing this function is not required for normal operation,
* in the usual case your app will start normally when waking from
* deep sleep.)
*
* esp_wake_deep_sleep() functionality is limited:
*
* - Runs immediately on wake, so most of the SoC is freshly reset -
* flash is unmapped and hardware is otherwise uninitialised.
*
* - Can only call functions implemented in ROM, or marked RTC_IRAM_ATTR.
*
* - Static variables marked RTC_DATA_ATTR will have initial values on
* cold boot, and maintain these values between sleep/wake cycles.
*
* - Read-only data should be marked RTC_RODATA_ATTR. Strings must be
* declared as variables also using RTC_RODATA_ATTR, like this:
* RTC_RODATA_ATTR const char message[] = "Hello from very early boot!\n";
*
* - Any other static memory will not be initialised (either to zero,
* or to any predefined value).
*
*
* - If you implement your own stub, the first call the stub makes
should be to esp_default_wake_deep_sleep().
*/
void esp_wake_deep_sleep(void);
/**
* @brief Function type for stub to run on wake from sleep.
*
*/
typedef void (*esp_deep_sleep_wake_stub_fn_t)(void);
/**
* @brief Install a new stub at runtime to run on wake from deep sleep
*
* If implementing esp_wake_deep_sleep() then it is not necessary to
* call this function.
*
* However, it is possible to call this function to substitute a
* different deep sleep stub. Any function used as a deep sleep stub
* must be marked RTC_IRAM_ATTR, and must obey the same rules given
* for esp_wake_deep_sleep().
*/
void esp_set_deep_sleep_wake_stub(esp_deep_sleep_wake_stub_fn_t new_stub);
/**
* @brief Return current wake from deep sleep stub, or NULL if
* no stub is installed.
*/
esp_deep_sleep_wake_stub_fn_t esp_get_deep_sleep_wake_stub(void);
/* The default esp-idf-provided esp_wake_deep_sleep() stub.
If you replace esp_wake_deep_sleep() in your program, or use
esp_set_deep_sleep_wake_stub(), then it is recommended you call
esp_default_wake_deep_sleep() as the first function in your stub.
*/
void esp_default_wake_deep_sleep(void);
/**
* @}
*/
/**
* @}
*/
#ifdef __cplusplus
}
#endif
#endif /* __ESP_SYSTEM_H__ */

16
components/esp32/include/esp_system.h
View file

@ -18,6 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include "esp_err.h" #include "esp_err.h"
#include "esp_deepsleep.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -62,21 +63,6 @@ void system_restore(void);
*/ */
void system_restart(void); void system_restart(void);
/**
* @brief Set the chip to deep-sleep mode.
*
* The device will automatically wake up after the deep-sleep time set
* by the users. Upon waking up, the device boots up from user_init.
*
* @attention The parameter time_in_us to be "uint64" is for further development.
* Only the low 32 bits of parameter time_in_us are avalable now.
*
* @param uint64 time_in_us : deep-sleep time, only the low 32bits are avalable now. unit: microsecond
*
* @return null
*/
void system_deep_sleep(uint64_t time_in_us);
/** /**
* @brief Get system time, unit: microsecond. * @brief Get system time, unit: microsecond.
* *

26
components/esp32/include/rom/rtc.h
View file

@ -44,25 +44,25 @@ extern "C" {
************************************************************************************* *************************************************************************************
* rtc memory addr type size usage * rtc memory addr type size usage
* 0x3ff61000(0x50000000) Slow SIZE_CP Co-Processor code/Reset Entry * 0x3ff61000(0x50000000) Slow SIZE_CP Co-Processor code/Reset Entry
* 0x3ff61000+SIZE_CP Slow 6144-SIZE_CP * 0x3ff61000+SIZE_CP Slow 4096-SIZE_CP
* 0x3ff62800 Slow 2048 Reserved * 0x3ff62800 Slow 4096 Reserved
* *
* 0x3ff80000(0x400c0000) Fast 8192 deep sleep entry code * 0x3ff80000(0x400c0000) Fast 8192 deep sleep entry code
* *
************************************************************************************* *************************************************************************************
* Rtc store registers usage * Rtc store registers usage
* RTC_STORE0 * RTC_CNTL_STORE0_REG
* RTC_STORE1 * RTC_CNTL_STORE1_REG
* RTC_STORE2 * RTC_CNTL_STORE2_REG
* RTC_STORE3 * RTC_CNTL_STORE3_REG
* RTC_STORE4 Reserved * RTC_CNTL_STORE4_REG Reserved
* RTC_STORE5 External Xtal Frequency * RTC_CNTL_STORE5_REG External Xtal Frequency
* RTC_STORE6 FAST_RTC_MEMORY_ENTRY * RTC_CNTL_STORE6_REG FAST_RTC_MEMORY_ENTRY
* RTC_STORE7 FAST_RTC_MEMORY_CRC * RTC_CNTL_STORE7_REG FAST_RTC_MEMORY_CRC
************************************************************************************* *************************************************************************************
*/ */
#define RTC_ENTRY_ADDR RTC_STORE6 #define RTC_ENTRY_ADDR_REG RTC_CNTL_STORE6_REG
#define RTC_MEMORY_CRC RTC_STORE7 #define RTC_MEMORY_CRC_REG RTC_CNTL_STORE7_REG
typedef enum { typedef enum {
@ -161,7 +161,7 @@ WAKEUP_REASON rtc_get_wakeup_cause(void);
* *
* @param uint32_t start_addr : 0 - 0x7ff for Fast RTC Memory. * @param uint32_t start_addr : 0 - 0x7ff for Fast RTC Memory.
* *
* @param uint32_t crc_len : 0 - 0x7ff, 0 for 1 byte, 0x7ff for 0x800 byte. * @param uint32_t crc_len : 0 - 0x7ff, 0 for 4 byte, 0x7ff for 0x2000 byte.
* *
* @return uint32_t : CRC32 result * @return uint32_t : CRC32 result
*/ */

14
components/esp32/ld/esp32.bt.ld
View file

@ -1,14 +0,0 @@
/* THESE ARE THE VIRTUAL RUNTIME ADDRESSES */
/* The load addresses are defined later using the AT statements. */
MEMORY
{
/* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length
of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
are connected to the data port of the CPU and eg allow bytewise access. */
iram0_0_seg (RX) : org = 0x40080000, len = 0x20000 /* IRAM for PRO cpu. Not sure if happy with this, this is MMU area... */
iram0_2_seg (RX) : org = 0x400D0018, len = 0x330000 /* Even though the segment name is iram, it is actually mapped to flash */
dram0_0_seg (RW) : org = 0x3FFC0000, len = 0x40000 /* Shared RAM, minus rom bss/data/stack.*/
drom0_0_seg (R) : org = 0x3F400010, len = 0x800000
}
_heap_end = 0x40000000;

14
components/esp32/ld/esp32.bt.trace.ld
View file

@ -1,14 +0,0 @@
/* THESE ARE THE VIRTUAL RUNTIME ADDRESSES */
/* The load addresses are defined later using the AT statements. */
MEMORY
{
/* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length
of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
are connected to the data port of the CPU and eg allow bytewise access. */
iram0_0_seg (RX) : org = 0x40080000, len = 0x20000 /* IRAM for PRO cpu. Not sure if happy with this, this is MMU area... */
iram0_2_seg (RX) : org = 0x400D0018, len = 0x330000 /* Even though the segment name is iram, it is actually mapped to flash */
dram0_0_seg (RW) : org = 0x3FFC0000, len = 0x38000 /* Shared RAM, minus rom bss/data/stack.*/
drom0_0_seg (R) : org = 0x3F400010, len = 0x800000
}
_heap_end = 0x3FFF8000;

16
components/esp32/ld/esp32.common.ld
View file

@ -102,7 +102,7 @@ SECTIONS
_rodata_start = ABSOLUTE(.); _rodata_start = ABSOLUTE(.);
*(.rodata) *(.rodata)
*(.rodata.*) *(.rodata.*)
*(.irom1.text) /* catch stray ICACHE_RODATA_ATTR */ *(.irom1.text) /* catch stray ICACHE_RODATA_ATTR */
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
@ -132,7 +132,7 @@ SECTIONS
*(.dynamic) *(.dynamic)
*(.gnu.version_d) *(.gnu.version_d)
_rodata_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.);
/* Literals are also RO data. */ /* Literals are also RO data. */
_lit4_start = ABSOLUTE(.); _lit4_start = ABSOLUTE(.);
*(*.lit4) *(*.lit4)
*(.lit4.*) *(.lit4.*)
@ -153,4 +153,16 @@ SECTIONS
_text_end = ABSOLUTE(.); _text_end = ABSOLUTE(.);
_etext = .; _etext = .;
} >iram0_2_seg } >iram0_2_seg
.rtc.text :
{
. = ALIGN(4);
*(.rtc.literal .rtc.text)
} >rtc_iram_seg
.rtc.data :
{
*(.rtc.data)
*(.rtc.rodata)
} > rtc_slow_seg
} }

53
components/esp32/ld/esp32.ld
View file

@ -1,14 +1,55 @@
/* THESE ARE THE VIRTUAL RUNTIME ADDRESSES */ /* ESP32 Linker Script Memory Layout
/* The load addresses are defined later using the AT statements. */
This file describes the memory layout (memory blocks) as virtual
memory addresses.
esp32.common.ld contains output sections to link compiler output
into these memory blocks.
***
This linker script is passed through the C preprocessor to include
configuration options.
Please use preprocessor features sparingly! Restrict
to simple macros with numeric values, and/or #if/#endif blocks.
*/
#include "sdkconfig.h"
MEMORY MEMORY
{ {
/* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length /* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length
of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
are connected to the data port of the CPU and eg allow bytewise access. */ are connected to the data port of the CPU and eg allow bytewise access. */
iram0_0_seg (RX) : org = 0x40080000, len = 0x20000 /* IRAM for PRO cpu. Not sure if happy with this, this is MMU area... */
iram0_2_seg (RX) : org = 0x400D0018, len = 0x330000 /* Even though the segment name is iram, it is actually mapped to flash */ /* IRAM for PRO cpu. Not sure if happy with this, this is MMU area... */
dram0_0_seg (RW) : org = 0x3FFB0000, len = 0x50000 /* Shared RAM, minus rom bss/data/stack.*/ iram0_0_seg (RX) : org = 0x40080000, len = 0x20000
/* Even though the segment name is iram, it is actually mapped to flash */
iram0_2_seg (RX) : org = 0x400D0018, len = 0x330000
/* Shared data RAM, excluding memory reserved for ROM bss/data/stack.
Enabling Bluetooth & Trace Memory features in menuconfig will decrease
the amount of RAM available.
*/
dram0_0_seg (RW) : org = 0x3FFB0000 + CONFIG_BT_RESERVE_DRAM,
len = 0x50000 - CONFIG_TRACEMEM_RESERVE_DRAM - CONFIG_BT_RESERVE_DRAM
/* Flash mapped constant data */
drom0_0_seg (R) : org = 0x3F400010, len = 0x800000 drom0_0_seg (R) : org = 0x3F400010, len = 0x800000
/* RTC fast memory (executable). Persists over deep sleep.
*/
rtc_iram_seg(RWX) : org = 0x400C0000, len = 0x2000
/* RTC slow memory (data accessible). Persists over deep sleep.
Start of RTC slow memory is reserved for ULP co-processor code + data, if enabled.
*/
rtc_slow_seg(RW) : org = 0x50000000 + CONFIG_ULP_COPROC_RESERVE_MEM,
len = 0x1000 - CONFIG_ULP_COPROC_RESERVE_MEM
} }
_heap_end = 0x40000000; /* Heap ends at top of dram0_0_seg */
_heap_end = 0x40000000 - CONFIG_TRACEMEM_RESERVE_DRAM;

14
components/esp32/ld/esp32.trace.ld
View file

@ -1,14 +0,0 @@
/* THESE ARE THE VIRTUAL RUNTIME ADDRESSES */
/* The load addresses are defined later using the AT statements. */
MEMORY
{
/* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length
of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
are connected to the data port of the CPU and eg allow bytewise access. */
iram0_0_seg (RX) : org = 0x40080000, len = 0x20000 /* IRAM for PRO cpu. Not sure if happy with this, this is MMU area... */
iram0_2_seg (RX) : org = 0x400D0018, len = 0x330000 /* Even though the segment name is iram, it is actually mapped to flash */
dram0_0_seg (RW) : org = 0x3FFB0000, len = 0x48000 /* Shared RAM, minus rom bss/data/stack.*/
drom0_0_seg (R) : org = 0x3F400010, len = 0x800000
}
_heap_end = 0x3FFF8000;

250
components/freertos/Kconfig
View file

@ -2,47 +2,47 @@ menu "FreeRTOS"
# This is actually also handled in the ESP32 startup code, not only in FreeRTOS. # This is actually also handled in the ESP32 startup code, not only in FreeRTOS.
config FREERTOS_UNICORE config FREERTOS_UNICORE
bool "Run FreeRTOS only on first core" bool "Run FreeRTOS only on first core"
default n default n
help help
This version of FreeRTOS normally takes control of all cores of This version of FreeRTOS normally takes control of all cores of
the CPU. Select this if you only want to start it on the first core. the CPU. Select this if you only want to start it on the first core.
This is needed when e.g. another process needs complete control This is needed when e.g. another process needs complete control
over the second core. over the second core.
choice FREERTOS_CORETIMER choice FREERTOS_CORETIMER
prompt "Xtensa timer to use as the FreeRTOS tick source" prompt "Xtensa timer to use as the FreeRTOS tick source"
default CONFIG_FREERTOS_CORETIMER_0 default CONFIG_FREERTOS_CORETIMER_0
help help
FreeRTOS needs a timer with an associated interrupt to use as FreeRTOS needs a timer with an associated interrupt to use as
the main tick source to increase counters, run timers and do the main tick source to increase counters, run timers and do
pre-emptive multitasking with. There are multiple timers available pre-emptive multitasking with. There are multiple timers available
to do this, with different interrupt priorities. Check to do this, with different interrupt priorities. Check
config FREERTOS_CORETIMER_0 config FREERTOS_CORETIMER_0
bool "Timer 0 (int 6, level 1)" bool "Timer 0 (int 6, level 1)"
help help
Select this to use timer 0 Select this to use timer 0
config FREERTOS_CORETIMER_1 config FREERTOS_CORETIMER_1
bool "Timer 1 (int 15, level 3)" bool "Timer 1 (int 15, level 3)"
help help
Select this to use timer 1 Select this to use timer 1
config FREERTOS_CORETIMER_2 config FREERTOS_CORETIMER_2
bool "Timer 2 (int 16, level 5)" bool "Timer 2 (int 16, level 5)"
help help
Select this to use timer 2 Select this to use timer 2
endchoice endchoice
config FREERTOS_HZ config FREERTOS_HZ
int "Tick rate (Hz)" int "Tick rate (Hz)"
range 1 10000 range 1 10000
default 100 default 100
help help
Select the tick rate at which FreeRTOS does pre-emptive context switching. Select the tick rate at which FreeRTOS does pre-emptive context switching.
config FREERTOS_ASSERT_ON_UNTESTED_FUNCTION config FREERTOS_ASSERT_ON_UNTESTED_FUNCTION
bool "Halt when an SMP-untested function is called" bool "Halt when an SMP-untested function is called"
@ -53,149 +53,149 @@ config FREERTOS_ASSERT_ON_UNTESTED_FUNCTION
will throw an assert(). will throw an assert().
choice FREERTOS_CHECK_STACKOVERFLOW choice FREERTOS_CHECK_STACKOVERFLOW
prompt "Check for stack overflow" prompt "Check for stack overflow"
default FREERTOS_CHECK_STACKOVERFLOW_QUICK default FREERTOS_CHECK_STACKOVERFLOW_QUICK
help help
FreeRTOS can check for stack overflows in threads and trigger an user function FreeRTOS can check for stack overflows in threads and trigger an user function
called vApplicationStackOverflowHook when this happens. called vApplicationStackOverflowHook when this happens.
config FREERTOS_CHECK_STACKOVERFLOW_NONE config FREERTOS_CHECK_STACKOVERFLOW_NONE
bool "No checking" bool "No checking"
help help
Do not check for stack overflows (configCHECK_FOR_STACK_OVERFLOW=0) Do not check for stack overflows (configCHECK_FOR_STACK_OVERFLOW=0)
config FREERTOS_CHECK_STACKOVERFLOW_PTRVAL config FREERTOS_CHECK_STACKOVERFLOW_PTRVAL
bool "Check by stack pointer value" bool "Check by stack pointer value"
help help
Check for stack overflows on each context switch by checking if Check for stack overflows on each context switch by checking if
the stack pointer is in a valid range. Quick but does not detect the stack pointer is in a valid range. Quick but does not detect
stack overflows that happened between context switches stack overflows that happened between context switches
(configCHECK_FOR_STACK_OVERFLOW=1) (configCHECK_FOR_STACK_OVERFLOW=1)
config FREERTOS_CHECK_STACKOVERFLOW_CANARY config FREERTOS_CHECK_STACKOVERFLOW_CANARY
bool "Check using canary bytes" bool "Check using canary bytes"
help help
Places some magic bytes at the end of the stack area and on each Places some magic bytes at the end of the stack area and on each
context switch, check if these bytes are still intact. More thorough context switch, check if these bytes are still intact. More thorough
than just checking the pointer, but also slightly slower. than just checking the pointer, but also slightly slower.
(configCHECK_FOR_STACK_OVERFLOW=2) (configCHECK_FOR_STACK_OVERFLOW=2)
endchoice endchoice
config FREERTOS_THREAD_LOCAL_STORAGE_POINTERS config FREERTOS_THREAD_LOCAL_STORAGE_POINTERS
int "Amount of thread local storage pointers" int "Amount of thread local storage pointers"
range 0 256 if !WIFI_ENABLED range 0 256 if !WIFI_ENABLED
range 1 256 if WIFI_ENABLED range 1 256 if WIFI_ENABLED
default 1 default 1
help help
FreeRTOS has the ability to store per-thread pointers in the task FreeRTOS has the ability to store per-thread pointers in the task
control block. This controls the amount of pointers available; control block. This controls the amount of pointers available;
0 turns off this functionality. 0 turns off this functionality.
If using the WiFi stack, this value must be at least 1. If using the WiFi stack, this value must be at least 1.
#This still needs to be implemented. #This still needs to be implemented.
choice FREERTOS_PANIC choice FREERTOS_PANIC
prompt "Panic handler behaviour" prompt "Panic handler behaviour"
default FREERTOS_PANIC_PRINT_REBOOT default FREERTOS_PANIC_PRINT_REBOOT
help help
If FreeRTOS detects unexpected behaviour or an unhandled exception, the panic handler is If FreeRTOS detects unexpected behaviour or an unhandled exception, the panic handler is
invoked. Configure the panic handlers action here. invoked. Configure the panic handlers action here.
config FREERTOS_PANIC_PRINT_HALT config FREERTOS_PANIC_PRINT_HALT
bool "Print registers and halt" bool "Print registers and halt"
help help
Outputs the relevant registers over the serial port and halt the Outputs the relevant registers over the serial port and halt the
processor. Needs a manual reset to restart. processor. Needs a manual reset to restart.
config FREERTOS_PANIC_PRINT_REBOOT config FREERTOS_PANIC_PRINT_REBOOT
bool "Print registers and reboot" bool "Print registers and reboot"
help help
Outputs the relevant registers over the serial port and immediately Outputs the relevant registers over the serial port and immediately
reset the processor. reset the processor.
config FREERTOS_PANIC_SILENT_REBOOT config FREERTOS_PANIC_SILENT_REBOOT
bool "Silent reboot" bool "Silent reboot"
help help
Just resets the processor without outputting anything Just resets the processor without outputting anything
config FREERTOS_PANIC_GDBSTUB config FREERTOS_PANIC_GDBSTUB
bool "Invoke GDBStub" bool "Invoke GDBStub"
help help
Invoke gdbstub on the serial port, allowing for gdb to attach to it to do a postmortem Invoke gdbstub on the serial port, allowing for gdb to attach to it to do a postmortem
of the crash. of the crash.
endchoice endchoice
config FREERTOS_DEBUG_OCDAWARE config FREERTOS_DEBUG_OCDAWARE
bool "Make exception and panic handlers JTAG/OCD aware" bool "Make exception and panic handlers JTAG/OCD aware"
default y default y
help help
The FreeRTOS panic and unhandled exception handers can detect a JTAG OCD debugger and The FreeRTOS panic and unhandled exception handers can detect a JTAG OCD debugger and
instead of panicking, have the debugger stop on the offending instruction. instead of panicking, have the debugger stop on the offending instruction.
choice FREERTOS_ASSERT choice FREERTOS_ASSERT
prompt "FreeRTOS assertions" prompt "FreeRTOS assertions"
default FREERTOS_ASSERT_FAIL_ABORT default FREERTOS_ASSERT_FAIL_ABORT
help help
Failed FreeRTOS configASSERT() assertions can be configured to Failed FreeRTOS configASSERT() assertions can be configured to
behave in different ways. behave in different ways.
config FREERTOS_ASSERT_FAIL_ABORT config FREERTOS_ASSERT_FAIL_ABORT
bool "abort() on failed assertions" bool "abort() on failed assertions"
help help
If a FreeRTOS configASSERT() fails, FreeRTOS will abort() and If a FreeRTOS configASSERT() fails, FreeRTOS will abort() and
halt execution. The panic handler can be configured to handle halt execution. The panic handler can be configured to handle
the outcome of an abort() in different ways. the outcome of an abort() in different ways.
config FREERTOS_ASSERT_FAIL_PRINT_CONTINUE config FREERTOS_ASSERT_FAIL_PRINT_CONTINUE
bool "Print and continue failed assertions" bool "Print and continue failed assertions"
help help
If a FreeRTOS assertion fails, print it out and continue. If a FreeRTOS assertion fails, print it out and continue.
config FREERTOS_ASSERT_DISABLE config FREERTOS_ASSERT_DISABLE
bool "Disable FreeRTOS assertions" bool "Disable FreeRTOS assertions"
help help
FreeRTOS configASSERT() will not be compiled into the binary. FreeRTOS configASSERT() will not be compiled into the binary.
endchoice endchoice
config FREERTOS_BREAK_ON_SCHEDULER_START_JTAG config FREERTOS_BREAK_ON_SCHEDULER_START_JTAG
bool "Stop program on scheduler start when JTAG/OCD is detected" bool "Stop program on scheduler start when JTAG/OCD is detected"
depends on FREERTOS_DEBUG_OCDAWARE depends on FREERTOS_DEBUG_OCDAWARE
default y default y
help help
If JTAG/OCD is connected, stop execution when the scheduler is started and the first If JTAG/OCD is connected, stop execution when the scheduler is started and the first
task is executed. task is executed.
menuconfig ENABLE_MEMORY_DEBUG menuconfig ENABLE_MEMORY_DEBUG
bool "Enable heap memory debug" bool "Enable heap memory debug"
default n default n
help help
Enable this option to show malloc heap block and memory crash detect Enable this option to show malloc heap block and memory crash detect
menuconfig FREERTOS_DEBUG_INTERNALS menuconfig FREERTOS_DEBUG_INTERNALS
bool "Debug FreeRTOS internals" bool "Debug FreeRTOS internals"
default n default n
help help
Enable this option to show the menu with internal FreeRTOS debugging features. Enable this option to show the menu with internal FreeRTOS debugging features.
This option does not change any code by itself, it just shows/hides some options. This option does not change any code by itself, it just shows/hides some options.
if FREERTOS_DEBUG_INTERNALS if FREERTOS_DEBUG_INTERNALS
config FREERTOS_PORTMUX_DEBUG config FREERTOS_PORTMUX_DEBUG
bool "Debug portMUX portENTER_CRITICAL/portEXIT_CRITICAL" bool "Debug portMUX portENTER_CRITICAL/portEXIT_CRITICAL"
depends on FREERTOS_DEBUG_INTERNALS depends on FREERTOS_DEBUG_INTERNALS
default n default n
help help
If enabled, debug information (including integrity checks) will be printed If enabled, debug information (including integrity checks) will be printed
to UART for the port-specific MUX implementation. to UART for the port-specific MUX implementation.
config FREERTOS_PORTMUX_DEBUG_RECURSIVE config FREERTOS_PORTMUX_DEBUG_RECURSIVE
bool "Debug portMUX Recursion" bool "Debug portMUX Recursion"
depends on FREERTOS_PORTMUX_DEBUG depends on FREERTOS_PORTMUX_DEBUG
default n default n
help help
If enabled, additional debug information will be printed for recursive If enabled, additional debug information will be printed for recursive
portMUX usage. portMUX usage.
endif # FREERTOS_DEBUG_INTERNALS endif # FREERTOS_DEBUG_INTERNALS

14
components/log/Kconfig
View file

@ -28,13 +28,13 @@ config LOG_DEFAULT_LEVEL_VERBOSE
endchoice endchoice
config LOG_DEFAULT_LEVEL config LOG_DEFAULT_LEVEL
int int
default 0 if LOG_DEFAULT_LEVEL_NONE default 0 if LOG_DEFAULT_LEVEL_NONE
default 1 if LOG_DEFAULT_LEVEL_ERROR default 1 if LOG_DEFAULT_LEVEL_ERROR
default 2 if LOG_DEFAULT_LEVEL_WARN default 2 if LOG_DEFAULT_LEVEL_WARN
default 3 if LOG_DEFAULT_LEVEL_INFO default 3 if LOG_DEFAULT_LEVEL_INFO
default 4 if LOG_DEFAULT_LEVEL_DEBUG default 4 if LOG_DEFAULT_LEVEL_DEBUG
default 5 if LOG_DEFAULT_LEVEL_VERBOSE default 5 if LOG_DEFAULT_LEVEL_VERBOSE
config LOG_COLORS config LOG_COLORS
bool "Use ANSI terminal colors in log output" bool "Use ANSI terminal colors in log output"

34
components/lwip/Kconfig
View file

@ -1,27 +1,27 @@
menu "LWIP" menu "LWIP"
config LWIP_MAX_SOCKETS config LWIP_MAX_SOCKETS
int "Max number of open sockets" int "Max number of open sockets"
range 1 16 range 1 16
default 4 default 4
help help
Sockets take up a certain amount of memory, and allowing fewer Sockets take up a certain amount of memory, and allowing fewer
sockets to be open at the same time conserves memory. Specify sockets to be open at the same time conserves memory. Specify
the maximum amount of sockets here. the maximum amount of sockets here.
config LWIP_THREAD_LOCAL_STORAGE_INDEX config LWIP_THREAD_LOCAL_STORAGE_INDEX
int "Index for thread-local-storage pointer for lwip" int "Index for thread-local-storage pointer for lwip"
default 0 default 0
help help
Specify the thread-local-storage-pointer index for lwip Specify the thread-local-storage-pointer index for lwip
use. use.
config LWIP_SO_REUSE config LWIP_SO_REUSE
bool "Enable SO_REUSEADDR option" bool "Enable SO_REUSEADDR option"
default 0 default 0
help help
Enabling this option allows binding to a port which remains in Enabling this option allows binding to a port which remains in
TIME_WAIT. TIME_WAIT.
endmenu endmenu

2
components/mbedtls/Kconfig
View file

@ -2,7 +2,7 @@ menu "mbedTLS"
config MBEDTLS_SSL_MAX_CONTENT_LEN config MBEDTLS_SSL_MAX_CONTENT_LEN
int "TLS maximum message content length" int "TLS maximum message content length"
default 16384 default 16384
range 512 16384 range 512 16384
help help
Maximum TLS message length (in bytes) supported by mbedTLS. Maximum TLS message length (in bytes) supported by mbedTLS.

18
components/spi_flash/Kconfig
View file

@ -1,15 +1,15 @@
menu "SPI Flash driver" menu "SPI Flash driver"
config SPI_FLASH_ENABLE_COUNTERS config SPI_FLASH_ENABLE_COUNTERS
bool "Enable operation counters" bool "Enable operation counters"
default 0 default 0
help help
This option enables the following APIs: This option enables the following APIs:
spi_flash_reset_counters spi_flash_reset_counters
spi_flash_dump_counters spi_flash_dump_counters
spi_flash_get_counters spi_flash_get_counters
These APIs may be used to collect performance data for spi_flash APIs These APIs may be used to collect performance data for spi_flash APIs
and to help understand behaviour of libraries which use SPI flash. and to help understand behaviour of libraries which use SPI flash.
endmenu endmenu