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

[platform/kernel/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 0a4dfe4..c4fd3ea 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -290,6 +290,9 @@ static int initr_dm(void)
        /* Save the pre-reloc driver model and start a new one */
        gd->dm_root_f = gd->dm_root;
        gd->dm_root = NULL;
+#ifdef CONFIG_TIMER
+       gd->timer = NULL;
+#endif
        return dm_init_and_scan(false);
 }
 #endif
@@ -544,11 +547,14 @@ static int initr_kgdb(void)
 }
 #endif
 
-#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)
+#if defined(CONFIG_STATUS_LED)
 static int initr_status_led(void)
 {
+#if defined(STATUS_LED_BOOT)
        status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING);
-
+#else
+       status_led_init();
+#endif
        return 0;
 }
 #endif
@@ -835,7 +841,7 @@ init_fnc_t init_sequence_r[] = {
        || defined(CONFIG_M68K)
        timer_init,             /* initialize timer */
 #endif
-#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)
+#if defined(CONFIG_STATUS_LED)
        initr_status_led,
 #endif
        /* PPC has a udelay(20) here dating from 2002. Why? */