From 4157c23c6fc954cca082bbd7dcdc56f29f4ca202 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sun, 2 Oct 2011 15:39:30 +0000 Subject: imx233/fuze+: don't use iram in plugins and in codecs git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30641 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/plugin.lds | 7 +++++++ firmware/export/config.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 49d965f5f4..c21d49d00b 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds @@ -171,6 +171,13 @@ OUTPUT_FORMAT(elf32-littlemips) #define IRAM DRAM #define IRAMSIZE 0 +#elif CONFIG_CPU == IMX233 +#include "cpu.h" +/* The IRAM is too small and already partly used by the core */ +#define DRAMORIG CACHED_DRAM_ADDR +#define IRAM DRAM +#define IRAMSIZE 0 + #else #define DRAMORIG 0x09000000 + STUBOFFSET #endif diff --git a/firmware/export/config.h b/firmware/export/config.h index a22922b0b1..1c55d232ef 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -841,7 +841,7 @@ Lyre prototype 1 */ (CONFIG_CPU == AS3525v2 && !defined(PLUGIN) && !defined(CODEC) && !defined(BOOTLOADER)) || /* AS3525v2: core only */ \ (CONFIG_CPU == PNX0101) || \ (CONFIG_CPU == TCC7801) || \ - (CONFIG_CPU == IMX233) || \ + (CONFIG_CPU == IMX233 && !defined(PLUGIN) && !defined(CODEC)) || /* IMX233: core only */ \ defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ (CONFIG_CPU == JZ4732 && !defined(PLUGIN) && !defined(CODEC)) /* Jz4740: core only */ #define ICODE_ATTR __attribute__ ((section(".icode"))) @@ -850,7 +850,7 @@ Lyre prototype 1 */ #define IBSS_ATTR __attribute__ ((section(".ibss"))) #define USE_IRAM #if CONFIG_CPU != SH7034 && (CONFIG_CPU != AS3525 || MEMORYSIZE > 2) \ - && CONFIG_CPU != JZ4732 && CONFIG_CPU != AS3525v2 + && CONFIG_CPU != JZ4732 && CONFIG_CPU != AS3525v2 && CONFIG_CPU != IMX233 #define PLUGIN_USE_IRAM #endif #if defined(CPU_ARM) && !defined(__ARM_EABI__) -- cgit v1.2.3