diff options
author | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /arch/arm/mach-realview/include | |
parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
download | linux-cea555d384b85271035814c5adad23e6c7fc5d2a.tar.gz linux-cea555d384b85271035814c5adad23e6c7fc5d2a.tar.bz2 linux-cea555d384b85271035814c5adad23e6c7fc5d2a.zip |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'arch/arm/mach-realview/include')
-rw-r--r-- | arch/arm/mach-realview/include/mach/platform.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/include/mach/platform.h index 4034b54950c2..793a3a332712 100644 --- a/arch/arm/mach-realview/include/mach/platform.h +++ b/arch/arm/mach-realview/include/mach/platform.h @@ -239,27 +239,10 @@ #define REALVIEW_DECODE_OFFSET 0xC /* Fitted logic modules */ /* - * Application Flash - * - */ -#define FLASH_BASE REALVIEW_FLASH_BASE -#define FLASH_SIZE REALVIEW_FLASH_SIZE -#define FLASH_END (FLASH_BASE + FLASH_SIZE - 1) -#define FLASH_BLOCK_SIZE SZ_128K - -/* - * Boot Flash - * - */ -#define EPROM_BASE REALVIEW_BOOT_ROM_HI -#define EPROM_SIZE REALVIEW_BOOT_ROM_SIZE -#define EPROM_END (EPROM_BASE + EPROM_SIZE - 1) - -/* * Clean base - dummy * */ -#define CLEAN_BASE EPROM_BASE +#define CLEAN_BASE REALVIEW_BOOT_ROM_HI /* * System controller bit assignment |