env: Rename setenv() to env_set()

[oweals/u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index ef909989328affa48160d9405d11b96dc5154286..a4a7384f8b4af042f49c943203af19626b7f2b22 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -57,9 +57,6 @@
 #include <dm/root.h>
 #include <linux/compiler.h>
 #include <linux/err.h>
-#ifdef CONFIG_AVR32
-#include <asm/arch/mmu.h>
-#endif
 #include <efi_loader.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -227,13 +224,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)
 {
@@ -266,7 +256,7 @@ static int initr_malloc(void)
 {
        ulong malloc_start;
 
-#ifdef CONFIG_SYS_MALLOC_F_LEN
+#if CONFIG_VAL(SYS_MALLOC_F_LEN)
        debug("Pre-reloc malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
              gd->malloc_ptr / 1024);
 #endif
@@ -297,8 +287,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
 
@@ -526,7 +523,7 @@ static int initr_api(void)
 #endif
 
 /* enable exceptions */
-#if defined(CONFIG_ARM) || defined(CONFIG_AVR32)
+#ifdef CONFIG_ARM
 static int initr_enable_interrupts(void)
 {
        enable_interrupts();
@@ -632,11 +629,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();
@@ -665,7 +658,7 @@ int initr_mem(void)
        pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024;
 # endif
        sprintf(memsz, "%ldk", (long int) ((gd->ram_size / 1024) - pram));
-       setenv("mem", memsz);
+       env_set("mem", memsz);
 
        return 0;
 }
@@ -779,9 +772,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,
@@ -839,6 +829,7 @@ static init_fnc_t init_sequence_r[] = {
 #endif
        console_init_r,         /* fully init console as a device */
 #ifdef CONFIG_DISPLAY_BOARDINFO_LATE
+       console_announce_r,
        show_board_info,
 #endif
 #ifdef CONFIG_ARCH_MISC_INIT
@@ -852,10 +843,10 @@ static init_fnc_t init_sequence_r[] = {
        initr_kgdb,
 #endif
        interrupt_init,
-#if defined(CONFIG_ARM) || defined(CONFIG_AVR32)
+#ifdef CONFIG_ARM
        initr_enable_interrupts,
 #endif
-#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) || defined(CONFIG_M68K)
+#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_M68K)
        timer_init,             /* initialize timer */
 #endif
 #if defined(CONFIG_LED_STATUS)
@@ -926,10 +917,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        int i;
 #endif
 
-#ifdef CONFIG_AVR32
-       mmu_init_r(dest_addr);
-#endif
-
 #if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
        gd = new_gd;
 #endif