diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /apps/plugins | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.bz2 rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.xz | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/SOURCES | 3 | ||||
| -rw-r--r-- | apps/plugins/SUBDIRS | 2 | ||||
| -rw-r--r-- | apps/plugins/plugin.lds | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 8479cd8..d581906 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 f537fb8..24333be 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 f38f606..6b4310c 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 |