From fd715fa95cc6bdd57f558cdbfc43bc768ec9645b Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 18 Jun 2010 17:33:51 +0000 Subject: as3525*: enable MMU in bootloader Reserve 1MB of DRAM for loading rockbox and use the rest as BSS Write sdram setup in assembler and move it to a separate file, together with MMU init code git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26926 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/as3525.h | 1 - firmware/export/config.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h index 6b0e85f9c5..52f10efb3e 100644 --- a/firmware/export/as3525.h +++ b/firmware/export/as3525.h @@ -31,7 +31,6 @@ #endif /* Virtual addresses */ -/* Do not apply to the bootloader, which uses physical addresses (no MMU) */ #define DRAM_ORIG 0x30000000 #define IRAM_ORIG (DRAM_ORIG + DRAM_SIZE) /* IRAM is mapped just next to DRAM */ diff --git a/firmware/export/config.h b/firmware/export/config.h index 22178e4bd4..de84dc3742 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -748,9 +748,9 @@ 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) || /* AS3525 +2MB: core, plugins, codecs */ \ - (CONFIG_CPU == AS3525 && MEMORYSIZE <= 2 && !defined(PLUGIN) && !defined(CODEC)) || /* AS3525 2MB: core only */ \ - (CONFIG_CPU == AS3525v2 && !defined(PLUGIN) && !defined(CODEC)) || /* AS3525v2: core only */ \ + (CONFIG_CPU == AS3525 && MEMORYSIZE > 2 && !defined(BOOTLOADER)) || /* AS3525 +2MB: core, plugins, codecs */ \ + (CONFIG_CPU == AS3525 && MEMORYSIZE <= 2 && !defined(PLUGIN) && !defined(CODEC) && !defined(BOOTLOADER)) || /* AS3525 2MB: core only */ \ + (CONFIG_CPU == AS3525v2 && !defined(PLUGIN) && !defined(CODEC) && !defined(BOOTLOADER)) || /* AS3525v2: core only */ \ (CONFIG_CPU == PNX0101) || \ (CONFIG_CPU == TCC7801) || \ defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ -- cgit v1.2.3