diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2006-12-29 16:48:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 10:56:42 -0800 |
| commit | 7f24516240c78760d0b19e6160dcab893ef81918 (patch) | |
| tree | 00301e41b250b42a1a26409a9db2e0a45f8517cd /arch/arm/mach-omap2 | |
| parent | de4fa99266b2e1f6771644b9b50f33fe8f82d728 (diff) | |
| download | op-kernel-dev-7f24516240c78760d0b19e6160dcab893ef81918.zip op-kernel-dev-7f24516240c78760d0b19e6160dcab893ef81918.tar.gz | |
[PATCH] ARM: OMAP: fix GPMC compiler errors
Fix GPMC compiler errors on OMAP2
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index f4f04d8..d8f5782 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -17,6 +17,7 @@ #include <linux/spinlock.h> #include <asm/io.h> +#include <asm/mach-types.h> #include <asm/arch/gpmc.h> #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; |
