summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-04-10 17:00:23 +0000
committerThomas Martitz <kugel@rockbox.org>2009-04-10 17:00:23 +0000
commitbac611868e499aadf58bfcc3a64e5c80eecf40bd (patch)
treed2b4b920ef3793afac7175258149f3695cdfd4f5
parent0eb9288056ac73b40f47d82b807e16b48f45292a (diff)
downloadrockbox-bac611868e499aadf58bfcc3a64e5c80eecf40bd.zip
rockbox-bac611868e499aadf58bfcc3a64e5c80eecf40bd.tar.gz
rockbox-bac611868e499aadf58bfcc3a64e5c80eecf40bd.tar.bz2
rockbox-bac611868e499aadf58bfcc3a64e5c80eecf40bd.tar.xz
FS#10114 - Sansa AMS : use IRAM for codecs on >2MB targets Rafaël Carré
Activates IRAM for AMS Sansas to be used by codecs and core. Fixes Reboot-on-mp3 and gives speed up on codecs using IRAM in general. I've made a change: the core/codec ratio is 0x20000/0x30000 instead of 0x10000/0x40000, 0x30000 is way more than codecs currently use (0x14000 at max) and the core might need more than 0x10000. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20678 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/plugin.lds4
-rw-r--r--firmware/export/config.h1
-rw-r--r--firmware/target/arm/as3525/app.lds10
3 files changed, 7 insertions, 8 deletions
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index d6f6234..46c4ad6 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -100,8 +100,8 @@ OUTPUT_FORMAT(elf32-littlemips)
#define CODEC_ORIGIN (0x50000 - CODEC_SIZE)
#define PLUGIN_ORIGIN (DRAMORIG + DRAMSIZE)
#else
-#define IRAMORIG 0x0
-#define IRAMSIZE 0x50000
+#define IRAMORIG 0x20000
+#define IRAMSIZE 0x30000
#endif
#define DRAMORIG 0x30000000
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 3b3333b..ac60e96 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -625,6 +625,7 @@ Lyre prototype 1*/
(((CONFIG_CPU == SH7034) && !defined(PLUGIN)) || /* SH1 archos: core only */ \
defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \
defined(CPU_PP) || /* PortalPlayer: core, plugins, codecs */ \
+ (CONFIG_CPU == AS3525 && MEMORYSIZE > 2) || \
(CONFIG_CPU == PNX0101) || \
(CONFIG_CPU == S5L8700)) /* Samsung S5L8700: core, plugins, codecs */
#define ICODE_ATTR __attribute__ ((section(".icode")))
diff --git a/firmware/target/arm/as3525/app.lds b/firmware/target/arm/as3525/app.lds
index 09844a1..7f37cc5 100644
--- a/firmware/target/arm/as3525/app.lds
+++ b/firmware/target/arm/as3525/app.lds
@@ -22,14 +22,14 @@ STARTUP(target/arm/crt0.o)
#include "cpu.h"
-#define IRAMSIZE 0x50000
-
#ifdef LOWMEM
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGINSIZE
-#define CODECORIG (IRAMORIG + IRAMSIZE - CODEC_SIZE)
+#define CODECORIG (IRAMORIG + 0x50000 - CODEC_SIZE)
+#define IRAMSIZE (0x50000 - CODEC_SIZE)
#else
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGINSIZE - CODECSIZE
#define CODECORIG (ENDAUDIOADDR)
+#define IRAMSIZE (0x20000)
#endif
#define IRAMORIG 0x0
@@ -48,11 +48,9 @@ STARTUP(target/arm/crt0.o)
MEMORY
{
#ifdef LOWMEM
- IRAM : ORIGIN = IRAMORIG, LENGTH = (IRAMSIZE - CODEC_SIZE)
CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE
-#else
- IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
#endif
+ IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
}