mpc85xx, mpc86xx: Fix gd->cpu pointer after relocation

[u-boot] / common / cmd_bootldr.c

diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c
index 423b09d307b921a73bc438b29136f9700e016455..b2a8b0e190b180cc20bed9708579c59fdee8287f 100644 (file)
--- a/common/cmd_bootldr.c
+++ b/common/cmd_bootldr.c
@@ -64,8 +64,6 @@ static void ldr_load(uint8_t *base_addr)
   /*defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__) ||*/\
     defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
 
-       void *ret;
-
        uint32_t addr;
        uint32_t count;
        uint16_t flags;
@@ -126,7 +124,7 @@ static void ldr_exec(void *addr)
 #elif defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__) || \
       defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
 
-       void (*ldr_entry)(void) = bfin_read_EVT1();
+       void (*ldr_entry)(void) = (void *)bfin_read_EVT1();
        ldr_entry();
 
 #else
@@ -172,4 +170,5 @@ int do_bootldr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(bootldr, 2, 0, do_bootldr,
        "boot ldr image from memory",
        "[addr]\n"
-       "    - boot ldr image stored in memory\n");
+       ""
+);