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

[people/ms/u-boot.git] / board / freescale / t4qds / spl.c

diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 6ca0f03ffe837b6ec886107b1248b5cb31d0c131..750f1554939be95c8604745e7d4f2c0c750bdbee 100644 (file)
--- a/board/freescale/t4qds/spl.c
+++ b/board/freescale/t4qds/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <environment.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>
@@ -112,7 +113,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);
@@ -129,11 +130,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 #endif
 
        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_MMC_BOOT
        mmc_boot();