Revert "ARM: set GD_FLG_RELOC for boards skipping relocation to RAM"

[u-boot] / lib_arm / board.c

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 5ade882a97e9d19527e025d846f7f77327c8516d..47e834c9d00e96811f6ade9cac9700797abdb665 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -220,18 +220,6 @@ static int init_func_i2c (void)
 }
 #endif
 
-#ifdef CONFIG_SKIP_RELOCATE_UBOOT
-/*
- * This routine sets the relocation done flag, because even if
- * relocation is skipped, the flag is used by other generic code.
- */
-static int reloc_init(void)
-{
-       gd->flags |= GD_FLG_RELOC;
-       return 0;
-}
-#endif
-
 /*
  * Breathe some life into the board...
  *
@@ -261,11 +249,6 @@ int print_cpuinfo (void); /* test-only */
 
 init_fnc_t *init_sequence[] = {
        cpu_init,               /* basic cpu dependent setup */
-#if defined(CONFIG_SKIP_RELOCATE_UBOOT)
-       reloc_init,             /* Set the relocation done flag, must
-                                  do this AFTER cpu_init(), but as soon
-                                  as possible */
-#endif
        board_init,             /* basic board dependent setup */
        interrupt_init,         /* set up exceptions */
        env_init,               /* initialize environment */