1 files changed, 6 insertions, 16 deletions

diff --git a/firmware/target/arm/as3525/app.lds b/firmware/target/arm/as3525/app.lds
index e19ff13878..b24a2cf00b 100644
--- a/firmware/target/arm/as3525/app.lds
+++ b/firmware/target/arm/as3525/app.lds
@@ -10,28 +10,18 @@ STARTUP(target/arm/crt0.o)
 #define PLUGINSIZE PLUGIN_BUFFER_SIZE
 #define CODECSIZE CODEC_SIZE
 
-#ifdef DEBUG
-#define STUBOFFSET 0x10000
-#else
-#define STUBOFFSET 0
-#endif
-
-
-#define IRAMORIG IRAM_ORIG
-#define DRAMORIG (DRAM_ORIG + STUBOFFSET)
-
 /* End of the audio buffer, where the codec buffer starts */
-#define ENDAUDIOADDR  (DRAMORIG + DRAMSIZE)
+#define ENDAUDIOADDR  (DRAM_ORIG + DRAMSIZE)
 
 #define CODEC_BUFFER_FILLS_IRAM defined(AMS_LOWMEM) || (CONFIG_CPU == AS3525v2)
 
 #if CODEC_BUFFER_FILLS_IRAM
 /* Entire codec buffer in IRAM */
-#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - TTB_SIZE)
-#define CODECORIG (IRAMORIG + (IRAM_SIZE - CODEC_SIZE))
+#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - TTB_SIZE)
+#define CODECORIG (IRAM_ORIG + (IRAM_SIZE - CODEC_SIZE))
 #define IRAMSIZE (IRAM_SIZE - CODEC_SIZE)
 #else
-#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE - TTB_SIZE)
+#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE - TTB_SIZE)
 #define CODECORIG (ENDAUDIOADDR)
 #define IRAMSIZE (0x20000)
 #endif
@@ -49,8 +39,8 @@ MEMORY
 #if CODEC_BUFFER_FILLS_IRAM
     CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE
 #endif
-    IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
-    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
+    IRAM : ORIGIN = IRAM_ORIG, LENGTH = IRAMSIZE
+    DRAM : ORIGIN = DRAM_ORIG, LENGTH = DRAMSIZE
 }
 
 SECTIONS