From ed17cbbb8a3fada40a4d8360f435205b35b93df6 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Thu, 6 Jun 2019 09:03:16 +0800 Subject: [PATCH 1/2] Make sure the psram_io struct is initialized Closes https://github.com/espressif/esp-idf/issues/3591 --- components/esp32/spiram_psram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/spiram_psram.c b/components/esp32/spiram_psram.c index f7d88c8592..54495f4981 100644 --- a/components/esp32/spiram_psram.c +++ b/components/esp32/spiram_psram.c @@ -616,7 +616,7 @@ psram_size_t psram_get_size() */ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vaddrmode) //psram init { - psram_io_t psram_io; + psram_io_t psram_io={0}; uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG); uint32_t pkg_ver = chip_ver & 0x7; if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5) { From 2b7da2a245f59d2b1e8ee94e2957bae57272af75 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Thu, 6 Jun 2019 16:57:01 +0800 Subject: [PATCH 2/2] Make unknown psram package version more obvious --- components/esp32/spiram_psram.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/esp32/spiram_psram.c b/components/esp32/spiram_psram.c index 54495f4981..3c9e9c356f 100644 --- a/components/esp32/spiram_psram.c +++ b/components/esp32/spiram_psram.c @@ -642,6 +642,9 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad ESP_EARLY_LOGI(TAG, "This chip is ESP32-D0WD"); psram_io.psram_clk_io = D0WD_PSRAM_CLK_IO; psram_io.psram_cs_io = D0WD_PSRAM_CS_IO; + } else { + ESP_EARLY_LOGE(TAG, "Not a valid or known package id: %d", pkg_ver); + abort(); } const uint32_t spiconfig = ets_efuse_get_spiconfig();