|
@@ -74,12 +74,7 @@ void board_init_f(ulong dummy)
|
|
|
|
|
|
void board_init_r(gd_t *id, ulong dummy)
|
|
|
{
|
|
|
-#ifdef CONFIG_SPL_NAND_LOAD
|
|
|
- nand_init();
|
|
|
- puts("Nand boot...\n");
|
|
|
- nand_boot();
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_SPL_SPI_LOAD
|
|
|
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
|
mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
|
|
|
CONFIG_SYS_MALLOC_LEN);
|
|
|
|
|
@@ -90,6 +85,14 @@ void board_init_r(gd_t *id, ulong dummy)
|
|
|
serial_init(); /* serial communications setup */
|
|
|
gd->have_console = 1;
|
|
|
|
|
|
+#endif
|
|
|
+
|
|
|
+#ifdef CONFIG_SPL_NAND_LOAD
|
|
|
+ nand_init();
|
|
|
+ puts("Nand boot...\n");
|
|
|
+ nand_boot();
|
|
|
+#endif
|
|
|
+#ifdef CONFIG_SPL_SPI_LOAD
|
|
|
puts("SPI boot...\n");
|
|
|
spi_boot();
|
|
|
#endif
|