mips: Use the generic bitops headers

[u-boot] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 1a46f6224fa93d078e04012e9763bb08ab181356..c4fd3eaf8cc1834a1292c79062340847a006f681 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -132,6 +132,8 @@ static int initr_reloc_global_data(void)
 {
 #ifdef __ARM__
        monitor_flash_len = _end - __image_copy_start;
+#elif defined(CONFIG_NDS32)
+       monitor_flash_len = (ulong)&_end - (ulong)&_start;
 #elif !defined(CONFIG_SANDBOX) && !defined(CONFIG_NIOS2)
        monitor_flash_len = (ulong)&__init_end - gd->relocaddr;
 #endif
@@ -288,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
@@ -444,6 +449,9 @@ static int initr_env(void)
                env_relocate();
        else
                set_default_env(NULL);
+#ifdef CONFIG_OF_CONTROL
+       setenv_addr("fdtcontroladdr", gd->fdt_blob);
+#endif
 
        /* Initialize from environment */
        load_addr = getenv_ulong("loadaddr", 16, load_addr);
@@ -480,17 +488,6 @@ static int initr_malloc_bootparams(void)
 }
 #endif
 
-#ifdef CONFIG_SC3
-/* TODO: with new initcalls, move this into the driver */
-extern void sc3_read_eeprom(void);
-
-static int initr_sc3_read_eeprom(void)
-{
-       sc3_read_eeprom();
-       return 0;
-}
-#endif
-
 static int initr_jumptable(void)
 {
        jumptable_init();
@@ -550,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
@@ -722,7 +722,7 @@ init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_DM
        initr_dm,
 #endif
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARM) || defined(CONFIG_NDS32)
        board_init,     /* Setup chipselects */
 #endif
        /*
@@ -804,9 +804,6 @@ init_fnc_t init_sequence_r[] = {
 #endif
        INIT_FUNC_WATCHDOG_RESET
        initr_secondary_cpu,
-#ifdef CONFIG_SC3
-       initr_sc3_read_eeprom,
-#endif
 #if defined(CONFIG_ID_EEPROM) || defined(CONFIG_SYS_I2C_MAC_OFFSET)
        mac_read_from_eeprom,
 #endif
@@ -844,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? */