3 files changed, 9 insertions, 0 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 8479cd8b9b..d581906637 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,3 +1,4 @@
+#ifndef GIGABEAT_S
 /* plugins common to all models */
 battery_bench.c
 chessclock.c
@@ -13,6 +14,7 @@ random_folder_advance_config.c
 rockblox.c
 rockbox_flash.c
 search.c
+shortcuts.c
 snow.c
 sort.c
 stats.c
@@ -144,3 +146,4 @@ iriver_flash.c
 /* Built for bitmap targets except H10 5/6gb, Archoses, iPod mini and ifp */
 superdom.c
 #endif
+#endif /* GIGABEAT_S */
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index f537fb8965..24333be3b9 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -1,4 +1,5 @@
 #ifndef IRIVER_IFP7XX_SERIES
+#ifndef GIGABEAT_S
 
 /* For all targets */
 shortcuts
@@ -45,4 +46,5 @@ doom
 mpegplayer
 #endif
 
+#endif /* GIGABEAT_S */
 #endif /* IRIVER_IFP7XX_SERIES */
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index f38f60656a..6b4310c0b7 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -43,6 +43,10 @@ OUTPUT_FORMAT(elf32-sh)
 #define IRAMORIG DRAMORIG
 #define IRAMSIZE 4K
 #define IRAM DRAM
+#elif CONFIG_CPU == IMX31L
+#define DRAMORIG 0x80000000
+#define IRAMORIG 0x1FFFC000
+#define IRAMSIZE 0x4000
 #else
 #define DRAMORIG 0x09000000 + STUBOFFSET
 #endif