From 8bea8dacbce9eeafc7ed56fad69cffc1eea40c1b Mon Sep 17 00:00:00 2001
From: wanglei <wanglei@espressif.com>
Date: Tue, 5 Nov 2019 13:03:33 +0800
Subject: [PATCH] esp32s2beta: fix some macro and add flash wrap size condition

---
 components/esp32s2beta/cpu_start.c | 2 +-
 components/spi_flash/cache_utils.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/esp32s2beta/cpu_start.c b/components/esp32s2beta/cpu_start.c
index a23b00afe..d299bc6ca 100644
--- a/components/esp32s2beta/cpu_start.c
+++ b/components/esp32s2beta/cpu_start.c
@@ -189,7 +189,7 @@ extern void esp_switch_rodata_to_dcache(void);
 extern void esp_spiram_enable_instruction_access(void);
     esp_spiram_enable_instruction_access();
 #endif
-#if SPIRAM_RODATA
+#if CONFIG_SPIRAM_RODATA
 extern void esp_spiram_enable_rodata_access(void);
     esp_spiram_enable_rodata_access();
 #endif
diff --git a/components/spi_flash/cache_utils.c b/components/spi_flash/cache_utils.c
index 7e715abcc..f529d21a7 100644
--- a/components/spi_flash/cache_utils.c
+++ b/components/spi_flash/cache_utils.c
@@ -511,6 +511,7 @@ extern uint32_t esp_spiram_rodata_access_enabled();
             spiram_wrap_sizes[0] = icache_wrap_size;
         } else {
             spiram_wrap_sizes[1] = dcache_wrap_size;
+            flash_wrap_sizes[1] = dcache_wrap_size;
         }
 #ifdef CONFIG_EXT_RODATA_SUPPORT
         spiram_wrap_sizes[1] = dcache_wrap_size;