]> git.sur5r.net Git - u-boot/blobdiff - arch/arm/mach-socfpga/spl.c
Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git...
[u-boot] / arch / arm / mach-socfpga / spl.c
index 82570f86174fd8b003158102cea0a0196aa4fead..98c16a000d83375b4b963511a802ab945a4f5c66 100644 (file)
@@ -40,6 +40,7 @@ u32 spl_boot_device(void)
                return BOOT_DEVICE_RAM;
        case 0x2:       /* NAND Flash (1.8V) */
        case 0x3:       /* NAND Flash (3.0V) */
+               socfpga_per_reset(SOCFPGA_RESET(NAND), 0);
                return BOOT_DEVICE_NAND;
        case 0x4:       /* SD/MMC External Transceiver (1.8V) */
        case 0x5:       /* SD/MMC Internal Transceiver (3.0V) */
@@ -178,5 +179,6 @@ void board_init_f(ulong dummy)
 
        socfpga_bridges_reset(1);
 
-       board_init_r(NULL, 0);
+       /* Configure simple malloc base pointer into RAM. */
+       gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024);
 }