diff options
author | Tony Lindgren <tony@atomide.com> | 2010-04-30 15:57:15 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-04 16:19:16 -0400 |
commit | 82cd4adefe5a67870f2113498bdfe9350edd2078 (patch) | |
tree | 2869a2bf74ead9022d3169d54c15047a0e6c6d1c | |
parent | dee5f8285e6300f34054afd39c9406fc2f709362 (diff) |
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>
-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) | |||
437 | } | 437 | } |
438 | #endif | 438 | #endif |
439 | 439 | ||
440 | #ifdef CONFIG_ARCH_OMAP4 | ||
441 | int __init omap44xx_sram_init(void) | ||
442 | { | ||
443 | printk(KERN_ERR "FIXME: %s not implemented\n", __func__); | ||
444 | |||
445 | return -ENODEV; | ||
446 | } | ||
447 | #else | ||
448 | static inline int omap44xx_sram_init(void) | ||
449 | { | ||
450 | return 0; | ||
451 | } | ||
452 | #endif | ||
453 | |||
440 | int __init omap_sram_init(void) | 454 | int __init omap_sram_init(void) |
441 | { | 455 | { |
442 | omap_detect_sram(); | 456 | omap_detect_sram(); |
@@ -451,7 +465,7 @@ int __init omap_sram_init(void) | |||
451 | else if (cpu_is_omap34xx()) | 465 | else if (cpu_is_omap34xx()) |
452 | omap34xx_sram_init(); | 466 | omap34xx_sram_init(); |
453 | else if (cpu_is_omap44xx()) | 467 | else if (cpu_is_omap44xx()) |
454 | omap34xx_sram_init(); /* FIXME: */ | 468 | omap44xx_sram_init(); |
455 | 469 | ||
456 | return 0; | 470 | return 0; |
457 | } | 471 | } |