From 5d849a963e562d1996c20cd72228835276288141 Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Wed, 2 Feb 2011 17:43:32 +0000 Subject: Clean up multiple definitions of RAM size. Remove -DMEM (make) and MEM (code), use the already defined MEMORYSIZE instead. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29189 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/crt0.S | 4 ++-- firmware/target/coldfire/iriver/system-iriver.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/target/coldfire') diff --git a/firmware/target/coldfire/crt0.S b/firmware/target/coldfire/crt0.S index 7734970ff0..e6717710b1 100644 --- a/firmware/target/coldfire/crt0.S +++ b/firmware/target/coldfire/crt0.S @@ -138,7 +138,7 @@ start: /* 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 */ -#if MEM < 32 +#if MEMORYSIZE < 32 move.w #0x8004,%d0 /* DCR - Synchronous, 80 cycle refresh */ #else move.w #0x8001,%d0 /* DCR - Synchronous, 32 cycle refresh */ @@ -153,7 +153,7 @@ start: In our case this means that we set the base address 16M ahead and use a 64M mask. */ -#if MEM < 32 +#if MEMORYSIZE < 32 move.l #0x31002324,%d0 /* DACR0 - Base 0x31000000, Banks on 21 and up, CAS latency 2, Page mode, No refresh yet */ move.l %d0,(0x108,%a0) diff --git a/firmware/target/coldfire/iriver/system-iriver.c b/firmware/target/coldfire/iriver/system-iriver.c index 1916eec0cd..1ceb89bd16 100644 --- a/firmware/target/coldfire/iriver/system-iriver.c +++ b/firmware/target/coldfire/iriver/system-iriver.c @@ -49,7 +49,7 @@ * 124185600 11 0x018ae025 59 29 0x1180 0x1580 0x2180 3 1 1 */ -#if MEM < 32 +#if MEMORYSIZE < 32 #define MAX_REFRESH_TIMER 59 #define NORMAL_REFRESH_TIMER 21 #define DEFAULT_REFRESH_TIMER 4 -- cgit v1.2.3