log: CONFIG_LOG should select CONFIG_DM

[u-boot] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 1965bda191577af0dd45e024e57c1e6833380a17..ae8bdb7c5c0c577df2d1999603bc5224f8318a97 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -18,7 +18,6 @@
 #include <fs.h>
 #include <i2c.h>
 #include <initcall.h>
-#include <init_helpers.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <os.h>
@@ -49,7 +48,7 @@
 #ifdef XTRN_DECLARE_GLOBAL_DATA_PTR
 #undef XTRN_DECLARE_GLOBAL_DATA_PTR
 #define XTRN_DECLARE_GLOBAL_DATA_PTR   /* empty = allocate here */
-DECLARE_GLOBAL_DATA_PTR = (gd_t *) (CONFIG_SYS_INIT_GD_ADDR);
+DECLARE_GLOBAL_DATA_PTR = (gd_t *)(CONFIG_SYS_INIT_GD_ADDR);
 #else
 DECLARE_GLOBAL_DATA_PTR;
 #endif
@@ -136,7 +135,7 @@ static int display_text_info(void)
 #endif
 
        debug("U-Boot code: %08lX -> %08lX  BSS: -> %08lX\n",
-               text_base, bss_start, bss_end);
+             text_base, bss_start, bss_end);
 #endif
 
        return 0;
@@ -420,7 +419,7 @@ static int reserve_malloc(void)
 {
        gd->start_addr_sp = gd->start_addr_sp - TOTAL_MALLOC_LEN;
        debug("Reserving %dk for malloc() at: %08lx\n",
-                       TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp);
+             TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp);
        return 0;
 }
 
@@ -450,7 +449,7 @@ static int reserve_global_data(void)
        gd->start_addr_sp -= sizeof(gd_t);
        gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
        debug("Reserving %zu Bytes for Global Data at: %08lx\n",
-                       sizeof(gd_t), gd->start_addr_sp);
+             sizeof(gd_t), gd->start_addr_sp);
        return 0;
 }
 
@@ -489,7 +488,7 @@ static int reserve_bootstage(void)
        return 0;
 }
 
-int arch_reserve_stacks(void)
+__weak int arch_reserve_stacks(void)
 {
        return 0;
 }
@@ -901,7 +900,8 @@ void board_init_f(ulong boot_flags)
                hang();
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
-               !defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64)
+               !defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64) && \
+               !defined(CONFIG_ARC)
        /* NOTREACHED - jump_to_copy() does not return */
        hang();
 #endif