Merge git://git.denx.de/u-boot-spi

[u-boot] / board / freescale / c29xpcie / spl.c

diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c
index d8d73c70b8e8e31a7b99b94947e87800780d761a..28541a72cb1808685d6d2a71890092a7d0ab16dd 100644 (file)
--- a/board/freescale/c29xpcie/spl.c
+++ b/board/freescale/c29xpcie/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>
@@ -53,7 +54,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);
@@ -63,11 +64,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
                            (uchar *)CONFIG_ENV_ADDR);
        gd->env_addr  = (ulong)(CONFIG_ENV_ADDR);
-       gd->env_valid = 1;
+       gd->env_valid = ENV_VALID;
 
        i2c_init_all();
 
-       gd->ram_size = initdram(0);
+       dram_init();
 
 #ifdef CONFIG_SPL_NAND_BOOT
        puts("TPL\n");