mach-snapdragon: set loadaddr

This variable is used by default in some commands, set it to the same as
kernel_addr_r.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 05664acb76dc49737a851c95252dad07c3176713..0af297470a64befa66cdccccf8c559b908e99e72 100644 (file)
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -423,11 +423,13 @@ void __weak qcom_late_init(void)
 int board_late_init(void)
 {
        u32 status = 0;
-       phys_addr_t fdt_addr;
+       phys_addr_t addr;
        struct fdt_header *fdt_blob = (struct fdt_header *)gd->fdt_blob;
 
        /* We need to be fairly conservative here as we support boards with just 1G of TOTAL RAM */
-       status |= env_set_hex("kernel_addr_r", addr_alloc(SZ_128M));
+       addr = addr_alloc(SZ_128M);
+       status |= env_set_hex("kernel_addr_r", addr);
+       status |= env_set_hex("loadaddr", addr);
        status |= env_set_hex("ramdisk_addr_r", addr_alloc(SZ_128M));
        status |= env_set_hex("kernel_comp_addr_r", addr_alloc(KERNEL_COMP_SIZE));
        status |= env_set_hex("kernel_comp_size", KERNEL_COMP_SIZE);
@@ -435,14 +437,14 @@ int board_late_init(void)
                status |= env_set_hex("fastboot_addr_r", addr_alloc(FASTBOOT_BUF_SIZE));
        status |= env_set_hex("scriptaddr", addr_alloc(SZ_4M));
        status |= env_set_hex("pxefile_addr_r", addr_alloc(SZ_4M));
-       fdt_addr = addr_alloc(SZ_2M);
-       status |= env_set_hex("fdt_addr_r", fdt_addr);
+       addr = addr_alloc(SZ_2M);
+       status |= env_set_hex("fdt_addr_r", addr);
 
        if (status)
                log_warning("%s: Failed to set run time variables\n", __func__);
 
        /* By default copy U-Boots FDT, it will be used as a fallback */
-       memcpy((void *)fdt_addr, (void *)gd->fdt_blob, fdt32_to_cpu(fdt_blob->totalsize));
+       memcpy((void *)addr, (void *)gd->fdt_blob, fdt32_to_cpu(fdt_blob->totalsize));
 
        configure_env();
        qcom_late_init();