diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /include/asm-blackfin/mach-bf527/mem_map.h | |
parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-blackfin/mach-bf527/mem_map.h')
-rw-r--r-- | include/asm-blackfin/mach-bf527/mem_map.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/include/asm-blackfin/mach-bf527/mem_map.h index c5aa20102b24..193082deaa4e 100644 --- a/include/asm-blackfin/mach-bf527/mem_map.h +++ b/include/asm-blackfin/mach-bf527/mem_map.h | |||
@@ -47,6 +47,7 @@ | |||
47 | /* Boot ROM Memory */ | 47 | /* Boot ROM Memory */ |
48 | 48 | ||
49 | #define BOOT_ROM_START 0xEF000000 | 49 | #define BOOT_ROM_START 0xEF000000 |
50 | #define BOOT_ROM_LENGTH 0x8000 | ||
50 | 51 | ||
51 | /* Level 1 Memory */ | 52 | /* Level 1 Memory */ |
52 | 53 | ||
@@ -90,9 +91,7 @@ | |||
90 | 91 | ||
91 | /* Scratch Pad Memory */ | 92 | /* Scratch Pad Memory */ |
92 | 93 | ||
93 | #if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF534) | ||
94 | #define L1_SCRATCH_START 0xFFB00000 | 94 | #define L1_SCRATCH_START 0xFFB00000 |
95 | #define L1_SCRATCH_LENGTH 0x1000 | 95 | #define L1_SCRATCH_LENGTH 0x1000 |
96 | #endif | ||
97 | 96 | ||
98 | #endif /* _MEM_MAP_527_H_ */ | 97 | #endif /* _MEM_MAP_527_H_ */ |