OMAP3+: reset: Create a common reset layer.

[oweals/u-boot.git] / arch / arm / cpu / armv7 / omap-common / spl.c

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 6b54ac7f018efe6c419f4acd54db2d14fd06ed80..4d1ac85d0091de429ccda8e341713ba0aa1c62e3 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -101,7 +101,7 @@ void spl_parse_image_header(const struct image_header *header)
                /* Signature not found - assume u-boot.bin */
                printf("mkimage signature not found - ih_magic = %x\n",
                        header->ih_magic);
-               puts("Assuming u-boot.bin ..\n");
+               debug("Assuming u-boot.bin ..\n");
                /* Let's assume U-Boot will not be more than 200 KB */
                spl_image.size = 200 * 1024;
                spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
@@ -124,7 +124,7 @@ static void __noreturn jump_to_image_linux(void *arg)
                __attribute__ ((noreturn));
        image_entry_arg_t image_entry =
                (image_entry_arg_t) spl_image.entry_point;
-       /* cleanup_before_linux(); */ /*write SPL function for that*/
+       cleanup_before_linux();
        image_entry(0, CONFIG_MACH_TYPE, arg);
 }
 #endif
@@ -162,6 +162,7 @@ void board_init_r(gd_t *id, ulong dummy)
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:
+       case BOOT_DEVICE_MMC2_2:
                spl_mmc_load_image();
                break;
 #endif