alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-18 10:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_update

Browse Source
This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
parent 24d26fccde 51d811a71c
commit 04ae56806c
657 changed files with 6814 additions and 7534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/ulp/ulp_macro.c
View File

@@ -20,6 +20,7 @@
#include "esp_err.h"
#include "esp_log.h"
#include "esp32/ulp.h"
#include "ulp_private.h"
#include "soc/soc.h"
#include "soc/rtc_cntl_reg.h"
@@ -167,7 +168,7 @@ esp_err_t ulp_process_macros_and_load(uint32_t load_addr, const ulp_insn_t* prog
++read_ptr;
}
size_t real_program_size = *psize - macro_count;
const size_t ulp_mem_end = CONFIG_ESP32_ULP_COPROC_RESERVE_MEM / sizeof(ulp_insn_t);
const size_t ulp_mem_end = ULP_RESERVE_MEM / sizeof(ulp_insn_t);
if (load_addr > ulp_mem_end) {
ESP_LOGW(TAG, "invalid load address %x, max is %x",
load_addr, ulp_mem_end);