Merge patch series "Move DRAM address of ATF"

[J-u-boot.git] / common / cli_hush.c

diff --git a/common/cli_hush.c b/common/cli_hush.c
index cee87249bc2cf9ba69cdb6cb157315dbca8c8bd2..9cda97f30e3c7fb241bf74b12b49f54f4565e0fc 100644 (file)
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -3305,19 +3305,6 @@ int parse_file_outer(void)
 }
 
 #ifdef __U_BOOT__
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-static void u_boot_hush_reloc(void)
-{
-       unsigned long addr;
-       struct reserved_combo *r;
-
-       for (r=reserved_list; r<reserved_list+NRES; r++) {
-               addr = (ulong) (r->literal) + gd->reloc_off;
-               r->literal = (char *)addr;
-       }
-}
-#endif
-
 int u_boot_hush_start(void)
 {
        if (top_vars == NULL) {
@@ -3327,9 +3314,6 @@ int u_boot_hush_start(void)
                top_vars->next = NULL;
                top_vars->flg_export = 0;
                top_vars->flg_read_only = 1;
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-               u_boot_hush_reloc();
-#endif
        }
        return 0;
 }