Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / arch / powerpc / lib / board.c

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 8b03d3aa07b1f4b383b58fe2eb0165157026423d..6eaab882437dda464db83c2943669203a26f2998 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -226,6 +226,9 @@ static int init_func_spi(void)
 #if defined(CONFIG_WATCHDOG)
 int init_func_watchdog_init(void)
 {
+#if defined(CONFIG_MPC85xx)
+       init_85xx_watchdog();
+#endif
        puts("       Watchdog enabled\n");
        WATCHDOG_RESET();
        return 0;
@@ -363,6 +366,8 @@ void board_init_f(ulong bootflag)
        memset((void *) gd, 0, sizeof(gd_t));
 #endif
 
+       gd->flags = bootflag;
+
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr)
                if ((*init_fnc_ptr) () != 0)
                        hang();
@@ -370,6 +375,11 @@ void board_init_f(ulong bootflag)
 #ifdef CONFIG_DEEP_SLEEP
        /* Jump to kernel in deep sleep case */
        if (in_be32(&gur->scrtsr[0]) & (1 << 3)) {
+               l2cache_init();
+#if defined(CONFIG_RAMBOOT_PBL)
+               disable_cpc_sram();
+#endif
+               enable_cpc();
                start_addr = in_be32(&scfg->sparecr[1]);
                kernel_resume = (func_t)start_addr;
                kernel_resume();
@@ -547,7 +557,6 @@ void board_init_f(ulong bootflag)
        bd->bi_ipbfreq = gd->arch.ipb_clk;
        bd->bi_pcifreq = gd->pci_clk;
 #endif /* CONFIG_MPC5xxx */
-       bd->bi_baudrate = gd->baudrate; /* Console Baudrate     */
 
 #ifdef CONFIG_SYS_EXTBDINFO
        strncpy((char *) bd->bi_s_version, "1.2", sizeof(bd->bi_s_version));
@@ -992,14 +1001,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
        kbd_init();
 #endif
 
-#ifdef CONFIG_MODEM_SUPPORT
-       {
-               extern int do_mdm_init;
-
-               do_mdm_init = gd->do_mdm_init;
-       }
-#endif
-
        /* Initialization complete - start the monitor */
 
        /* main_loop() can return to retry autoboot, if so just run it again. */