len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sansa AMS: Centralise mapping of RAM and IRAM in as3525.h via #defines. This will hopefully make ongoing mmu work easier as less places need to be changed.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21000 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-05-20 21:09:53 +00:00
parent fba4be213f
commit 4633446517
5 changed files with 56 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
firmware/target/arm/as3525/app.lds
View file

@ -1,4 +1,5 @@
#include "config.h"
#include "cpu.h"
ENTRY(start)
@ -6,11 +7,6 @@ OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_ARCH(arm)
STARTUP(target/arm/crt0.o)
#if MEMORYSIZE <= 2
/* we put the codec buffer in IRAM */
#define LOWMEM
#endif
#define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE
@ -20,26 +16,27 @@ STARTUP(target/arm/crt0.o)
#define STUBOFFSET 0
#endif
#include "cpu.h"
#ifdef LOWMEM
#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGINSIZE
#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
#define DRAMORIG 0x30000000 + STUBOFFSET
#define IRAMORIG IRAM_ORIG
#define DRAMORIG (DRAM_ORIG + STUBOFFSET)
/* End of the audio buffer, where the codec buffer starts */
#define ENDAUDIOADDR (DRAMORIG + DRAMSIZE)
#ifdef AMS_LOWMEM
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - TTB_SIZE)
#define CODECORIG (IRAMORIG + (IRAM_SIZE - CODEC_SIZE))
#define IRAMSIZE (IRAM_SIZE - CODEC_SIZE)
#else
#define DRAMSIZE (DRAM_SIZE - STUBOFFSET - PLUGINSIZE - CODECSIZE - TTB_SIZE)
#define CODECORIG (ENDAUDIOADDR)
#define IRAMSIZE (0x20000)
#endif
/* Where the codec buffer ends, and the plugin buffer starts */
#ifdef LOWMEM
#ifdef AMS_LOWMEM
#define ENDADDR (ENDAUDIOADDR)
#else
#define ENDADDR (ENDAUDIOADDR + CODECSIZE)
@ -47,7 +44,7 @@ STARTUP(target/arm/crt0.o)
MEMORY
{
#ifdef LOWMEM
#ifdef AMS_LOWMEM
CODEC_IRAM : ORIGIN = CODECORIG, LENGTH = CODEC_SIZE
#endif
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
@ -56,7 +53,7 @@ MEMORY
SECTIONS
{
loadaddress = 0x30000000;
loadaddress = DRAM_ORIG;
.text :
{
@ -71,10 +68,7 @@ SECTIONS
.rodata :
{
*(.rodata) /* problems without this, dunno why */
*(.rodata*)
*(.rodata.str1.1)
*(.rodata.str1.4)
. = ALIGN(0x4);
} > DRAM
@ -152,7 +146,7 @@ SECTIONS
{
codecbuf = .;
_codecbuf = .;
#ifdef LOWMEM
#ifdef AMS_LOWMEM
} > CODEC_IRAM
#else
} > DRAM

10
firmware/target/arm/as3525/boot.lds
View file

@ -1,18 +1,22 @@
#include "config.h"
#include "cpu.h"
ENTRY(start)
OUTPUT_FORMAT(elf32-littlearm)
OUTPUT_ARCH(arm)
STARTUP(target/arm/crt0.o)
#define DRAMSIZE (MEMORYSIZE * 0x100000)
/*
No need for DRAM in our bootloader
#define DRAMSIZE (MEMORYSIZE * 0x100000) - TTB_SIZE
#define DRAMORIG 0x30000000
#define IRAMORIG 0
*/
#define IRAMORIG 0x81000000
#define IRAMSIZE 0x50000
MEMORY
{
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
/*DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE*/
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
}