diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-30 12:57:15 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-04 13:19:16 -0700 |
| commit | 82cd4adefe5a67870f2113498bdfe9350edd2078 (patch) | |
| tree | 2869a2bf74ead9022d3169d54c15047a0e6c6d1c /arch | |
| parent | dee5f8285e6300f34054afd39c9406fc2f709362 (diff) | |
| download | blackbird-op-linux-82cd4adefe5a67870f2113498bdfe9350edd2078.tar.gz blackbird-op-linux-82cd4adefe5a67870f2113498bdfe9350edd2078.zip | |
omap4: Fix multiboot with CONFIG_PM and CONFIG_ARCH_OMAP3 selected
We cannot use the omap34xx_sram_init(). It needs to be implemented
for omap4. Otherwise we get an error and the system won't boot:
Unhandled fault: imprecise external abort (0x1406) at 0xea963e94
...
Fix this by adding a dummy omap44xx_sram_init().
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 51f4dfb82e2b..226b2e858d6c 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -437,6 +437,20 @@ static inline int omap34xx_sram_init(void) } #endif +#ifdef CONFIG_ARCH_OMAP4 +int __init omap44xx_sram_init(void) +{ + printk(KERN_ERR "FIXME: %s not implemented\n", __func__); + + return -ENODEV; +} +#else +static inline int omap44xx_sram_init(void) +{ + return 0; +} +#endif + int __init omap_sram_init(void) { omap_detect_sram(); @@ -451,7 +465,7 @@ int __init omap_sram_init(void) else if (cpu_is_omap34xx()) omap34xx_sram_init(); else if (cpu_is_omap44xx()) - omap34xx_sram_init(); /* FIXME: */ + omap44xx_sram_init(); return 0; } |
