len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx233/fuze+: fix ctr0 to use a fresh stack and update firmware linker script

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30523 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-09-13 23:38:45 +00:00
parent 3d46b080fd
commit ddb96f1b65
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/target/arm/imx233/app.lds
View file

@ -9,9 +9,6 @@ STARTUP(target/arm/imx233/crt0.o)
#define PLUGINSIZE PLUGIN_BUFFER_SIZE #define PLUGINSIZE PLUGIN_BUFFER_SIZE
#define CODECSIZE CODEC_SIZE #define CODECSIZE CODEC_SIZE
#define DRAMORIG DRAM_ORIG
#define IRAMORIG IRAM_ORIG
#define IRAMSIZE IRAM_SIZE #define IRAMSIZE IRAM_SIZE
#define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE - FRAME_SIZE - TTB_SIZE) #define DRAMSIZE (DRAM_SIZE - PLUGINSIZE - CODECSIZE - FRAME_SIZE - TTB_SIZE)
@ -28,26 +25,24 @@ STARTUP(target/arm/imx233/crt0.o)
MEMORY MEMORY
{ {
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE IRAM : ORIGIN = IRAM_ORIG, LENGTH = IRAMSIZE
DRAM : ORIGIN = CACHED_DRAM_ADDR, LENGTH = DRAM_SIZE - TTB_SIZE - FRAME_SIZE DRAM : ORIGIN = CACHED_DRAM_ADDR, LENGTH = DRAM_SIZE - TTB_SIZE - FRAME_SIZE
UNCACHED_DRAM : ORIGIN = UNCACHED_DRAM_ADDR, LENGTH = DRAM_SIZE - TTB_SIZE - FRAME_SIZE UDRAM : ORIGIN = UNCACHED_DRAM_ADDR, LENGTH = DRAM_SIZE - TTB_SIZE - FRAME_SIZE
} }
SECTIONS SECTIONS
{ {
loadaddress = UNCACHED_DRAM_ADDR;
_loadaddress = UNCACHED_DRAM_ADDR;
.text : .text :
{ {
*(.text*) *(.text*)
} > DRAM
.data :
{
*(.data*) *(.data*)
*(.rodata*) *(.rodata*)
_dataend = . ;
} > DRAM } > DRAM
.iram : .itext :
{ {
_iramstart = .; // always 0 _iramstart = .; // always 0
*(.vectors) *(.vectors)
@ -59,7 +54,7 @@ SECTIONS
_iramend = .; _iramend = .;
} > IRAM AT> DRAM } > IRAM AT> DRAM
_iramcopy = LOADADDR(.iram); _iramcopy = LOADADDR(.itext);
.ibss (NOLOAD) : .ibss (NOLOAD) :
{ {
@ -75,6 +70,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_initstart = .; _initstart = .;
*(.init) *(.init)
. = ALIGN(0x4);
_initend = .; _initend = .;
} AT> DRAM } AT> DRAM
@ -88,6 +84,9 @@ SECTIONS
stackend = .; stackend = .;
} > DRAM } > DRAM
/* physical address of the stack */
stackend_phys = stackend - CACHED_DRAM_ADDR + UNCACHED_DRAM_ADDR;
/* treat .bss and .ncbss as a single section */ /* treat .bss and .ncbss as a single section */
.bss (NOLOAD) : .bss (NOLOAD) :
{ {

11
firmware/target/arm/imx233/crt0.S
View file

@ -33,9 +33,9 @@
ldr pc, =irq_handler ldr pc, =irq_handler
ldr pc, =fiq_handler ldr pc, =fiq_handler
/* When starting, we are running at 0x40000000 but the code /* When starting, we are running at 0x4xxxxxxx (uncached) but the code
* assumes DRAM is somewhere else (for caching) so we first need to * assumes DRAM is somewhere else (cached) so we first need to
* setup the MMU and then jump to the right location */ * setup the MMU and then jump to the right location. */
.text .text
.global start .global start
start: start:
@ -49,9 +49,12 @@ start:
bic r0, r1 bic r0, r1
mcr p15, 0, r0, c1, c0, 0 mcr p15, 0, r0, c1, c0, 0
/* To call the C code we need a stack, since the stack is in virtual memory
* use the stack's physical address */
ldr sp, =stackend_phys
/* Enable MMU */ /* Enable MMU */
bl memory_init bl memory_init
/* Jump to real location */ /* Jump to real location */
ldr pc, =remap ldr pc, =remap
remap: remap: