Fix and use mgos_iram.h for ESP32

cesanta · Jan 13, 2021 · 3aae00d · 3aae00d
1 parent e456939
commit 3aae00d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/include/mgos_iram.h b/include/mgos_iram.h
@@ -25,10 +25,15 @@
 #ifndef __ASSEMBLER__
 #define _IRAM_STR_LIT(a) #a
 #define _IRAM_STR(a) _IRAM_STR_LIT(a)
+#if CS_PLATFORM == CS_P_ESP32
+#define _IRAM_SECTION_PREFIX ".iram1"
+#else
+#define _IRAM_SECTION_PREFIX ".text.IRAM"
+#endif
 
 #define IRAM     \
   __attribute__( \
-      (section(".text.IRAM." _IRAM_STR(__LINE__) "." _IRAM_STR(__COUNTER__))))
+      (section(_IRAM_SECTION_PREFIX "." _IRAM_STR(__LINE__) "." _IRAM_STR(__COUNTER__))))
 
 #define NOINLINE __attribute__((noinline))
 #endif  // __ASSEMBLER__
diff --git a/platforms/esp32/src/esp32_src.mk b/platforms/esp32/src/esp32_src.mk
@@ -64,7 +64,7 @@ APP_OBJS = $(addsuffix .o,$(APP_SRCS))
 BUILD_INFO_OBJS = $(addsuffix .o,$(notdir $(BUILD_INFO_C)) $(notdir $(MG_BUILD_INFO_C)))
 
 C_CXX_CFLAGS += -DMGOS_APP=\"$(APP)\" -DFW_ARCHITECTURE=$(APP_PLATFORM) \
-                -DIRAM='__attribute__((section(".iram1")))' \
+                -include mgos_iram.h \
                 $(MG_FEATURES_TINY) -DMG_NET_IF=MG_NET_IF_LWIP_LOW_LEVEL \
                 $(MGOS_FEATURES) -DMGOS_MAX_NUM_UARTS=3 \
                 -DMGOS_DEBUG_UART=$(MGOS_DEBUG_UART) \