feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

cleaned up

Browse Source
This commit is contained in:
Zim Kalinowski
2022-11-23 08:45:56 +01:00
parent 95cc3e5b6c
commit 17ba68d89a
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_common/test_apps/esp_common/main/test_attr.c
View File

@@ -33,13 +33,13 @@ extern int _ext_ram_bss_end;
//Variables for test: Attributes place variables into correct sections //Variables for test: Attributes place variables into correct sections
static __NOINIT_ATTR uint32_t s_noinit; static __NOINIT_ATTR uint32_t s_noinit;
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) #if SOC_RTC_MEM_SUPPORTED
static RTC_NOINIT_ATTR uint32_t s_rtc_noinit; static RTC_NOINIT_ATTR uint32_t s_rtc_noinit;
static RTC_DATA_ATTR uint32_t s_rtc_data; static RTC_DATA_ATTR uint32_t s_rtc_data;
static RTC_RODATA_ATTR uint32_t s_rtc_rodata; static RTC_RODATA_ATTR uint32_t s_rtc_rodata;
static RTC_FAST_ATTR uint32_t s_rtc_force_fast; static RTC_FAST_ATTR uint32_t s_rtc_force_fast;
static RTC_SLOW_ATTR uint32_t s_rtc_force_slow; static RTC_SLOW_ATTR uint32_t s_rtc_force_slow;
#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) #endif // SOC_RTC_MEM_SUPPORTED
#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
static EXT_RAM_NOINIT_ATTR uint32_t s_noinit_ext; static EXT_RAM_NOINIT_ATTR uint32_t s_noinit_ext;
#endif #endif
@@ -54,8 +54,7 @@ TEST_CASE("Attributes place variables into correct sections", "[ld]")
{ {
TEST_ASSERT(data_in_segment(&s_noinit, &_noinit_start, &_noinit_end)); TEST_ASSERT(data_in_segment(&s_noinit, &_noinit_start, &_noinit_end));
//IDF-5045 #if SOC_RTC_MEM_SUPPORTED
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
TEST_ASSERT(data_in_segment(&s_rtc_noinit, &_rtc_noinit_start, &_rtc_noinit_end)); TEST_ASSERT(data_in_segment(&s_rtc_noinit, &_rtc_noinit_start, &_rtc_noinit_end));
TEST_ASSERT(data_in_segment(&s_rtc_data, &_rtc_data_start, &_rtc_data_end)); TEST_ASSERT(data_in_segment(&s_rtc_data, &_rtc_data_start, &_rtc_data_end));
TEST_ASSERT(data_in_segment(&s_rtc_rodata, &_rtc_data_start, &_rtc_data_end)); TEST_ASSERT(data_in_segment(&s_rtc_rodata, &_rtc_data_start, &_rtc_data_end));
@@ -76,7 +75,7 @@ TEST_CASE("Attributes place variables into correct sections", "[ld]")
TEST_ASSERT(data_in_segment(&s_rtc_force_fast, (int*) SOC_RTC_DRAM_LOW, (int*) SOC_RTC_DRAM_HIGH)); TEST_ASSERT(data_in_segment(&s_rtc_force_fast, (int*) SOC_RTC_DRAM_LOW, (int*) SOC_RTC_DRAM_HIGH));
TEST_ASSERT(data_in_segment(&s_rtc_force_slow, (int*) SOC_RTC_DATA_LOW, (int*) SOC_RTC_DATA_HIGH)); TEST_ASSERT(data_in_segment(&s_rtc_force_slow, (int*) SOC_RTC_DATA_LOW, (int*) SOC_RTC_DATA_HIGH));
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2) #endif // SOC_RTC_MEM_SUPPORTED
#if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
TEST_ASSERT(data_in_segment(&s_noinit_ext, &_ext_ram_noinit_start, &_ext_ram_noinit_end)); TEST_ASSERT(data_in_segment(&s_noinit_ext, &_ext_ram_noinit_start, &_ext_ram_noinit_end));

4
components/esp_common/test_apps/esp_common/sdkconfig.ci.esp32_psram
View File

@@ -1,10 +1,6 @@
CONFIG_IDF_TARGET="esp32" CONFIG_IDF_TARGET="esp32"
CONFIG_SPIRAM=y CONFIG_SPIRAM=y
CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
CONFIG_SPIRAM_OCCUPY_NO_HOST=y CONFIG_SPIRAM_OCCUPY_NO_HOST=y
CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
CONFIG_ESP32_WIFI_IRAM_OPT=n
# Disable encrypted flash reads/writes to save IRAM in this build configuration
CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y

1
components/esp_common/test_apps/esp_common/sdkconfig.defaults
View File

@@ -1,3 +1,2 @@
CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_HZ=1000
CONFIG_ESP_TASK_WDT=n CONFIG_ESP_TASK_WDT=n
CONFIG_SPIRAM=y