1 files changed, 9 insertions, 11 deletions

diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 9c65f31779..d6f62341ce 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -35,18 +35,20 @@ OUTPUT_FORMAT(elf32-littlemips)
 #define NOCACHE_BASE 0x00000000
 #endif
 
-#if CONFIG_CPU==DM320 || CONFIG_CPU==S3C2440
-#define LCD_BUFFER_SIZE  (LCD_WIDTH*LCD_HEIGHT*2)
+#if CONFIG_CPU==DM320 || CONFIG_CPU==IMX31L
+/* Give this 1 meg to allow it to align to the MMU boundary */
+#define LCD_TTB_AREA    0x100000
+#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_TTB_AREA
 
+#elif CONFIG_CPU==S3C2440
+#define LCD_BUFFER_SIZE  (LCD_WIDTH*LCD_HEIGHT*2)
 /* must be 16Kb (0x4000) aligned */
 #define TTB_SIZE         (0x4000) 
 #define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE
-#elif CONFIG_CPU==IMX31L
-#include "imx31l.h"
-/* Reserve 1mb for LCD buffer/TTB as in app.lds */
-#define DRAMSIZE (MEMORYSIZE * 0x100000 - 0x100000) - PLUGIN_BUFFER_SIZE - STUBOFFSET - CODEC_SIZE
+
 #elif CONFIG_CPU==AS3525 && MEMORYSIZE <= 2
 #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGIN_BUFFER_SIZE - STUBOFFSET
+
 #else
 #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGIN_BUFFER_SIZE - STUBOFFSET - CODEC_SIZE
 #endif
@@ -77,11 +79,7 @@ OUTPUT_FORMAT(elf32-littlemips)
 #define DRAMORIG 0xc00000 + STUBOFFSET
 #define IRAMORIG 0x407000
 #define IRAMSIZE 0x9000
-#elif CONFIG_CPU == S3C2440
-#define DRAMORIG 0x0 + STUBOFFSET
-#define IRAM DRAM
-#define IRAMSIZE 0
-#elif CONFIG_CPU == IMX31L
+#elif CONFIG_CPU == IMX31L || CONFIG_CPU == S3C2440
 #define DRAMORIG 0x0 + STUBOFFSET
 #define IRAM DRAM
 #define IRAMSIZE 0