devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Recovered from my major brain failure and reverted to using the same load address for both H110 and H120/140

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7082 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2005-07-09 07:46:42 +00:00
parent f69c77933c
commit 62c768c0db
5 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/plugins/plugin.lds
View file

@ -18,14 +18,10 @@ OUTPUT_FORMAT(elf32-sh)
#define ARCH_IRIVER #define ARCH_IRIVER
#endif #endif
#if defined(IRIVER_H120) || defined(IRIVER_H300) #ifdef ARCH_IRIVER
#define DRAMORIG 0x31000000 #define DRAMORIG 0x31000000
#define IRAMORIG 0x10010000 #define IRAMORIG 0x10010000
#define IRAMSIZE 0x8000 #define IRAMSIZE 0x8000
#elif defined(IRIVER_H100)
#define DRAMORIG 0x30000000
#define IRAMORIG 0x10010000
#define IRAMSIZE 0x8000
#else #else
#define DRAMORIG 0x09000000 + STUBOFFSET #define DRAMORIG 0x09000000 + STUBOFFSET
#endif #endif

4
bootloader/main.c
View file

@ -35,12 +35,12 @@
#include "power.h" #include "power.h"
#include "file.h" #include "file.h"
#define DRAM_START 0x31000000
#ifdef IRIVER_H100 #ifdef IRIVER_H100
#define MODEL_NUMBER 1 #define MODEL_NUMBER 1
#define DRAM_START 0x30000000
#else #else
#define MODEL_NUMBER 0 #define MODEL_NUMBER 0
#define DRAM_START 0x31000000
#endif #endif
int line = 0; int line = 0;

10
firmware/app.lds
View file

@ -113,14 +113,10 @@ _pluginbuf = 0;
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE
#ifdef IRIVER_H100_SERIES #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300)
#define IRAMSIZE 0x10000
#define IRAMORIG 0x10000000
#ifdef IRIVER_H100
#define DRAMORIG 0x30000000 + STUBOFFSET
#else /* H120/H140 */
#define DRAMORIG 0x31000000 + STUBOFFSET #define DRAMORIG 0x31000000 + STUBOFFSET
#endif #define IRAMORIG 0x10000000
#define IRAMSIZE 0x10000
#else #else
#define DRAMORIG 0x09000000 + STUBOFFSET #define DRAMORIG 0x09000000 + STUBOFFSET
#define IRAMORIG 0x0f000000 #define IRAMORIG 0x0f000000

2
firmware/boot.lds
View file

@ -16,7 +16,7 @@ INPUT(crt0.o)
#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE
#ifdef IRIVER_H100 #ifdef IRIVER_H100_SERIES
#define DRAMORIG 0x31000000 #define DRAMORIG 0x31000000
#define IRAMORIG 0x10000000 #define IRAMORIG 0x10000000
#define IRAMSIZE 0x18000 #define IRAMSIZE 0x18000

17
firmware/crt0.S
View file

@ -190,7 +190,7 @@ irq_handler:
/* Set up the DRAM controller. The refresh is based on the 11.2896MHz /* Set up the DRAM controller. The refresh is based on the 11.2896MHz
clock (5.6448MHz bus frequency). We haven't yet started the PLL */ clock (5.6448MHz bus frequency). We haven't yet started the PLL */
#ifdef IRIVER_H100 #if MEM < 32
move.w #0x8202,%d0 /* DCR - Synchronous, 64 cycle refresh */ move.w #0x8202,%d0 /* DCR - Synchronous, 64 cycle refresh */
#else #else
move.w #0x8001,%d0 /* DCR - Synchronous, 32 cycle refresh */ move.w #0x8001,%d0 /* DCR - Synchronous, 32 cycle refresh */
@ -205,8 +205,8 @@ irq_handler:
In our case this means that we set the base address 16M ahead and In our case this means that we set the base address 16M ahead and
use a 64M mask. use a 64M mask.
*/ */
#ifdef IRIVER_H100 #if MEM < 32
move.l #0x30002320,%d0 /* DACR0 - Base 0x30000000, Banks on 21 and up, move.l #0x31002320,%d0 /* DACR0 - Base 0x31000000, Banks on 21 and up,
CAS latency 1, No refresh yet */ CAS latency 1, No refresh yet */
move.l %d0,(0x108,%a0) move.l %d0,(0x108,%a0)
move.l #0x00fc0001,%d0 /* Size: 16M */ move.l #0x00fc0001,%d0 /* Size: 16M */
@ -224,10 +224,7 @@ irq_handler:
or.l %d0,(0x108,%a0) /* DACR0[IP] = 1, next access will issue a or.l %d0,(0x108,%a0) /* DACR0[IP] = 1, next access will issue a
Precharge command */ Precharge command */
move.l #0xabcd1234,%d0 move.l #0xabcd1234,%d0
move.l %d0,0x30000000 /* Issue precharge command by writing somewhere move.l %d0,0x31000000 /* Issue precharge command */
in the SDRAM. (The 0x30000000 address is
mirrored on 32Mbyte devices so it works on
all models.) */
/* Let it refresh */ /* Let it refresh */
move.l #1000,%d0 move.l #1000,%d0
@ -245,7 +242,7 @@ irq_handler:
or.l %d0,(0x108,%a0) or.l %d0,(0x108,%a0)
move.l #0xabcd1234,%d0 move.l #0xabcd1234,%d0
move.l %d0,0x30000800 /* A12=1 means CASL=1 (a0 is not connected) */ move.l %d0,0x31000800 /* A12=1 means CASL=1 (a0 is not connected) */
move.l #0xffffffbf,%d0 move.l #0xffffffbf,%d0
and.l %d0,(0x108,%a0) /* Back to normal, the DRAM is now ready */ and.l %d0,(0x108,%a0) /* Back to normal, the DRAM is now ready */
@ -260,11 +257,7 @@ irq_handler:
movec.l %d0,%cacr movec.l %d0,%cacr
/* Cache enabled in SDRAM only, buffered writes enabled */ /* Cache enabled in SDRAM only, buffered writes enabled */
#ifdef IRIVER_H100
move.l #0x3003c020,%d0
#else
move.l #0x3103c020,%d0 move.l #0x3103c020,%d0
#endif
movec.l %d0,%acr0 movec.l %d0,%acr0
moveq.l #0,%d0 moveq.l #0,%d0
movec.l %d0,%acr1 movec.l %d0,%acr1