Merge tag 'dm-pull-5jan21' of git://git.denx.de/u-boot-dm into next

[J-u-boot.git] / board / freescale / t4rdb / spl.c

diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 5d018c316c61c798bbd8b9953cd6f12da22a8b39..fc624efbe6328f51c2bfbc2e9142ad2348843ca1 100644 (file)
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -60,7 +60,7 @@ void board_init_f(ulong bootflag)
        plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
        ccb_clk = sys_clk * plat_ratio / 2;
 
-       NS16550_init((NS16550_t)CONFIG_SYS_NS16550_COM1,
+       ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
                     ccb_clk / 16 / CONFIG_BAUDRATE);
 
        puts("\nSD boot...\n");
@@ -70,13 +70,11 @@ void board_init_f(ulong bootflag)
 
 void board_init_r(gd_t *gd, ulong dest_addr)
 {
-       bd_t *bd;
+       struct bd_info *bd;
 
-       bd = (bd_t *)(gd + sizeof(gd_t));
-       memset(bd, 0, sizeof(bd_t));
+       bd = (struct bd_info *)(gd + sizeof(gd_t));
+       memset(bd, 0, sizeof(struct bd_info));
        gd->bd = bd;
-       bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
-       bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
        arch_cpu_init();
        get_clocks();