aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2013-03-06 15:12:59 -0500
committerJon Hunter <jon-hunter@ti.com>2013-04-03 21:13:40 -0400
commitbf2343974e331d1627f6f904160dedc99a81c10d (patch)
tree7f7ce1d0e8e593e58198630351773d851a231967 /arch/arm/mach-omap2
parentc71f8e9bef8a3e022537361505c09f8c357ffd18 (diff)
ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable
With commit 21cc2bd (ARM: OMAP2+: Remove apollon board support) the variable "boot_rom_space" is now not needed and the code surrounding this variable can be cleaned up and simplified. Remove unnecessary definitions and clean-up the comment as well. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/gpmc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 5c22b5adaeb5..a259dc0bf063 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -92,9 +92,7 @@
92#define GPMC_CS_SIZE 0x30 92#define GPMC_CS_SIZE 0x30
93#define GPMC_BCH_SIZE 0x10 93#define GPMC_BCH_SIZE 0x10
94 94
95#define GPMC_MEM_START 0x00000000
96#define GPMC_MEM_END 0x3FFFFFFF 95#define GPMC_MEM_END 0x3FFFFFFF
97#define BOOT_ROM_SPACE 0x100000 /* 1MB */
98 96
99#define GPMC_CHUNK_SHIFT 24 /* 16 MB */ 97#define GPMC_CHUNK_SHIFT 24 /* 16 MB */
100#define GPMC_SECTION_SHIFT 28 /* 128 MB */ 98#define GPMC_SECTION_SHIFT 28 /* 128 MB */
@@ -790,13 +788,13 @@ static void gpmc_mem_exit(void)
790static int gpmc_mem_init(void) 788static int gpmc_mem_init(void)
791{ 789{
792 int cs, rc; 790 int cs, rc;
793 unsigned long boot_rom_space = 0;
794 791
795 /* never allocate the first page, to facilitate bug detection; 792 /*
796 * even if we didn't boot from ROM. 793 * The first 1MB of GPMC address space is typically mapped to
794 * the internal ROM. Never allocate the first page, to
795 * facilitate bug detection; even if we didn't boot from ROM.
797 */ 796 */
798 boot_rom_space = BOOT_ROM_SPACE; 797 gpmc_mem_root.start = SZ_1M;
799 gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
800 gpmc_mem_root.end = GPMC_MEM_END; 798 gpmc_mem_root.end = GPMC_MEM_END;
801 799
802 /* Reserve all regions that has been set up by bootloader */ 800 /* Reserve all regions that has been set up by bootloader */