Skip to content

Commit

Permalink
omap4: Fix multiboot with CONFIG_PM and CONFIG_ARCH_OMAP3 selected
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren committed May 4, 2010
1 parent dee5f82 commit 82cd4ad
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion arch/arm/plat-omap/sram.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
}

0 comments on commit 82cd4ad

Please sign in to comment.