forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
de4fa99266
commit
7f24516240
@ -17,6 +17,7 @@
|
|||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
#include <asm/mach-types.h>
|
||||||
#include <asm/arch/gpmc.h>
|
#include <asm/arch/gpmc.h>
|
||||||
|
|
||||||
#undef DEBUG
|
#undef DEBUG
|
||||||
@ -338,19 +339,13 @@ void __init gpmc_mem_init(void)
|
|||||||
int cs;
|
int cs;
|
||||||
unsigned long boot_rom_space = 0;
|
unsigned long boot_rom_space = 0;
|
||||||
|
|
||||||
if (cpu_is_omap242x()) {
|
/* never allocate the first page, to facilitate bug detection;
|
||||||
u32 l;
|
* even if we didn't boot from ROM.
|
||||||
l = omap_readl(OMAP242X_CONTROL_STATUS);
|
*/
|
||||||
/* In case of internal boot the 1st MB is redirected to the
|
boot_rom_space = BOOT_ROM_SPACE;
|
||||||
* boot ROM memory space.
|
/* In apollon the CS0 is mapped as 0x0000 0000 */
|
||||||
*/
|
if (machine_is_omap_apollon())
|
||||||
if (l & (1 << 3))
|
boot_rom_space = 0;
|
||||||
boot_rom_space = BOOT_ROM_SPACE;
|
|
||||||
} else
|
|
||||||
/* We assume internal boot if the mode can't be
|
|
||||||
* determined.
|
|
||||||
*/
|
|
||||||
boot_rom_space = BOOT_ROM_SPACE;
|
|
||||||
gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
|
gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
|
||||||
gpmc_mem_root.end = GPMC_MEM_END;
|
gpmc_mem_root.end = GPMC_MEM_END;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user