diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
commit | 5d849a963e562d1996c20cd72228835276288141 (patch) | |
tree | 8c96a2524f6c1b6d714506a8d012a9c7ded24918 /firmware/target/arm | |
parent | 35bcdef1441519bb66a77b675013309ef39e9eec (diff) | |
download | rockbox-5d849a963e562d1996c20cd72228835276288141.tar.gz rockbox-5d849a963e562d1996c20cd72228835276288141.zip |
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
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/as3525/system-target.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/crt0-pp.S | 4 | ||||
-rw-r--r-- | firmware/target/arm/crt0-pp502x-bl-usb.S | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/crt0.S | 2 | ||||
-rw-r--r-- | firmware/target/arm/thread-pp.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/as3525/system-target.h b/firmware/target/arm/as3525/system-target.h index 6db16af040..7c9dcccc0c 100644 --- a/firmware/target/arm/as3525/system-target.h +++ b/firmware/target/arm/as3525/system-target.h | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | #define AS3525_UNCACHED_ADDR(a) ((typeof(a)) ((uintptr_t)(a) + 0x10000000)) | 43 | #define AS3525_UNCACHED_ADDR(a) ((typeof(a)) ((uintptr_t)(a) + 0x10000000)) |
44 | #define AS3525_PHYSICAL_ADDR(a) \ | 44 | #define AS3525_PHYSICAL_ADDR(a) \ |
45 | ((typeof(a)) ((((uintptr_t)(a)) & (MEM*0x100000)) \ | 45 | ((typeof(a)) ((((uintptr_t)(a)) & (MEMORYSIZE*0x100000)) \ |
46 | ? (((uintptr_t)(a)) - IRAM_ORIG) \ | 46 | ? (((uintptr_t)(a)) - IRAM_ORIG) \ |
47 | : ((uintptr_t)(a)))) | 47 | : ((uintptr_t)(a)))) |
48 | 48 | ||
diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S index 585455f821..12c885068d 100644 --- a/firmware/target/arm/crt0-pp.S +++ b/firmware/target/arm/crt0-pp.S | |||
@@ -48,7 +48,7 @@ start: | |||
48 | .equ CACHE_CTRL, 0xcf004024 | 48 | .equ CACHE_CTRL, 0xcf004024 |
49 | .equ MMAP_LOG, 0xf000f000 /* MMAP0 */ | 49 | .equ MMAP_LOG, 0xf000f000 /* MMAP0 */ |
50 | .equ MMAP_PHYS, 0xf000f004 | 50 | .equ MMAP_PHYS, 0xf000f004 |
51 | #if MEM > 32 | 51 | #if MEMORYSIZE > 32 |
52 | .equ MMAP_MASK, 0x00003c00 | 52 | .equ MMAP_MASK, 0x00003c00 |
53 | #else | 53 | #else |
54 | .equ MMAP_MASK, 0x00003e00 | 54 | .equ MMAP_MASK, 0x00003e00 |
@@ -69,7 +69,7 @@ start: | |||
69 | .equ CACHE_CTRL, 0x6000c000 | 69 | .equ CACHE_CTRL, 0x6000c000 |
70 | .equ MMAP_LOG, 0xf000f000 /* MMAP0 */ | 70 | .equ MMAP_LOG, 0xf000f000 /* MMAP0 */ |
71 | .equ MMAP_PHYS, 0xf000f004 | 71 | .equ MMAP_PHYS, 0xf000f004 |
72 | #if MEM > 32 | 72 | #if MEMORYSIZE > 32 |
73 | .equ MMAP_MASK, 0x00003c00 | 73 | .equ MMAP_MASK, 0x00003c00 |
74 | #else | 74 | #else |
75 | .equ MMAP_MASK, 0x00003e00 | 75 | .equ MMAP_MASK, 0x00003e00 |
diff --git a/firmware/target/arm/crt0-pp502x-bl-usb.S b/firmware/target/arm/crt0-pp502x-bl-usb.S index c360596001..c8b7fb4ee8 100644 --- a/firmware/target/arm/crt0-pp502x-bl-usb.S +++ b/firmware/target/arm/crt0-pp502x-bl-usb.S | |||
@@ -47,7 +47,7 @@ | |||
47 | .equ CACHE_ENAB, 0x1 | 47 | .equ CACHE_ENAB, 0x1 |
48 | .equ CACHE_OP_COMMIT_DISCARD, 0x1 | 48 | .equ CACHE_OP_COMMIT_DISCARD, 0x1 |
49 | .equ CACHE_OP_COMMIT , 0x0 | 49 | .equ CACHE_OP_COMMIT , 0x0 |
50 | #if MEM > 32 | 50 | #if MEMORYSIZE > 32 |
51 | .equ MMAP_MASK, 0x00003c00 | 51 | .equ MMAP_MASK, 0x00003c00 |
52 | #else | 52 | #else |
53 | .equ MMAP_MASK, 0x00003e00 | 53 | .equ MMAP_MASK, 0x00003e00 |
diff --git a/firmware/target/arm/tcc77x/crt0.S b/firmware/target/arm/tcc77x/crt0.S index 7c900212db..251fd0c903 100644 --- a/firmware/target/arm/tcc77x/crt0.S +++ b/firmware/target/arm/tcc77x/crt0.S | |||
@@ -109,7 +109,7 @@ start_loc: | |||
109 | mov r0, #0x20000000 /* Otherwise, load address is the start of DRAM */ | 109 | mov r0, #0x20000000 /* Otherwise, load address is the start of DRAM */ |
110 | #endif | 110 | #endif |
111 | mov r1, #0x20000000 /* Destination: 1MB from end of DRAM */ | 111 | mov r1, #0x20000000 /* Destination: 1MB from end of DRAM */ |
112 | add r1, r1, #((MEM - 1) * 0x100000) | 112 | add r1, r1, #((MEMORYSIZE - 1) * 0x100000) |
113 | 113 | ||
114 | ldr r2, =_dataend | 114 | ldr r2, =_dataend |
115 | 1: | 115 | 1: |
diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/thread-pp.c index 0c077779e5..3eb7238a25 100644 --- a/firmware/target/arm/thread-pp.c +++ b/firmware/target/arm/thread-pp.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #if defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64 | 24 | #if defined(MAX_PHYS_SECTOR_SIZE) && MEMORYSIZE == 64 |
25 | /* Support a special workaround object for large-sector disks */ | 25 | /* Support a special workaround object for large-sector disks */ |
26 | #define IF_NO_SKIP_YIELD(...) __VA_ARGS__ | 26 | #define IF_NO_SKIP_YIELD(...) __VA_ARGS__ |
27 | #endif | 27 | #endif |