powerpc, 8xx: remove support for 8xx

[u-boot] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index bd77d646a1325b959ce8791174b12f40c00c22cd..adc1f1937ed1fd9bec0b1b6080e658a1f4f52fb0 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -227,13 +227,6 @@ static int initr_post_backlog(void)
 }
 #endif
 
-#ifdef CONFIG_SYS_DELAYED_ICACHE
-static int initr_icache_enable(void)
-{
-       return 0;
-}
-#endif
-
 #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
 static int initr_unlock_ram_in_cache(void)
 {
@@ -297,8 +290,15 @@ static int initr_noncached(void)
 #ifdef CONFIG_OF_LIVE
 static int initr_of_live(void)
 {
-       return of_live_build(gd->fdt_blob,
-                             (struct device_node **)&gd->of_root);
+       int ret;
+
+       bootstage_start(BOOTSTAGE_ID_ACCUM_OF_LIVE, "of_live");
+       ret = of_live_build(gd->fdt_blob, (struct device_node **)&gd->of_root);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_OF_LIVE);
+       if (ret)
+               return ret;
+
+       return 0;
 }
 #endif
 
@@ -313,7 +313,9 @@ static int initr_dm(void)
 #ifdef CONFIG_TIMER
        gd->timer = NULL;
 #endif
+       bootstage_start(BOOTSTATE_ID_ACCUM_DM_R, "dm_r");
        ret = dm_init_and_scan(false);
+       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R);
        if (ret)
                return ret;
 #ifdef CONFIG_TIMER_EARLY
@@ -328,7 +330,6 @@ static int initr_dm(void)
 
 static int initr_bootstage(void)
 {
-       /* We cannot do this before initr_dm() */
        bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r");
 
        return 0;
@@ -631,11 +632,7 @@ static int initr_pcmcia(void)
 #if defined(CONFIG_IDE)
 static int initr_ide(void)
 {
-#ifdef CONFIG_IDE_8xx_PCCARD
-       puts("PCMCIA:");
-#else
        puts("IDE:   ");
-#endif
 #if defined(CONFIG_START_IDE)
        if (board_start_ide())
                ide_init();
@@ -727,6 +724,7 @@ static init_fnc_t init_sequence_r[] = {
 #endif
        initr_barrier,
        initr_malloc,
+       initr_bootstage,        /* Needs malloc() but has its own timer */
        initr_console_record,
 #ifdef CONFIG_SYS_NONCACHED_MEMORY
        initr_noncached,
@@ -738,7 +736,6 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_DM
        initr_dm,
 #endif
-       initr_bootstage,
 #if defined(CONFIG_ARM) || defined(CONFIG_NDS32)
        board_init,     /* Setup chipselects */
 #endif
@@ -778,9 +775,6 @@ static init_fnc_t init_sequence_r[] = {
        initr_post_backlog,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_SYS_DELAYED_ICACHE
-       initr_icache_enable,
-#endif
 #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)
        /*
         * Do early PCI configuration _before_ the flash gets initialised,