From 7f24516240c78760d0b19e6160dcab893ef81918 Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Fri, 29 Dec 2006 16:48:51 -0800 Subject: [PATCH] ARM: OMAP: fix GPMC compiler errors Fix GPMC compiler errors on OMAP2 Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/arm/mach-omap2/gpmc.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index f4f04d87df3..d8f57824423 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -17,6 +17,7 @@ #include #include +#include #include #undef DEBUG @@ -338,19 +339,13 @@ void __init gpmc_mem_init(void) int cs; unsigned long boot_rom_space = 0; - if (cpu_is_omap242x()) { - u32 l; - l = omap_readl(OMAP242X_CONTROL_STATUS); - /* In case of internal boot the 1st MB is redirected to the - * boot ROM memory space. - */ - if (l & (1 << 3)) - boot_rom_space = BOOT_ROM_SPACE; - } else - /* We assume internal boot if the mode can't be - * determined. - */ - boot_rom_space = BOOT_ROM_SPACE; + /* never allocate the first page, to facilitate bug detection; + * even if we didn't boot from ROM. + */ + boot_rom_space = BOOT_ROM_SPACE; + /* In apollon the CS0 is mapped as 0x0000 0000 */ + if (machine_is_omap_apollon()) + boot_rom_space = 0; gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space; gpmc_mem_root.end = GPMC_MEM_END; -- cgit v1.2.3