[U-Boot] [PATCH]85xx/p1_p2rdb: Bug Fix: Crash while configuring 32 bit DDR i/f for P1020RDB.

[Poonam Aggrwal]

The data being modified was in NOR flash which caused the crash.
file->board/freescale/p1_p2_rdb/ddr.c
function->fixed_sdram()

Signed-off-by: Poonam Aggrwal <poonam.aggr...@freescale.com>
Signed-off-by: Kumar Gala <ga...@kernel.crashing.org>
---
 board/freescale/p1_p2_rdb/ddr.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/board/freescale/p1_p2_rdb/ddr.c b/board/freescale/p1_p2_rdb/ddr.c
index 90d86ec..a30b695 100644
--- a/board/freescale/p1_p2_rdb/ddr.c
+++ b/board/freescale/p1_p2_rdb/ddr.c
@@ -211,7 +211,7 @@ phys_size_t fixed_sdram (void)
 {
        sys_info_t sysinfo;
        char buf[32];
-       fsl_ddr_cfg_regs_t *ddr_cfg_regs = NULL;
+       fsl_ddr_cfg_regs_t ddr_cfg_regs;
        size_t ddr_size;
        struct cpu_type *cpu;
 
@@ -220,13 +220,13 @@ phys_size_t fixed_sdram (void)
                                strmhz(buf, sysinfo.freqDDRBus));
 
        if(sysinfo.freqDDRBus <= DATARATE_400MHZ)
-               ddr_cfg_regs = &ddr_cfg_regs_400;
+               memcpy(&ddr_cfg_regs, &ddr_cfg_regs_400, sizeof(ddr_cfg_regs));
        else if(sysinfo.freqDDRBus <= DATARATE_533MHZ)
-               ddr_cfg_regs = &ddr_cfg_regs_533;
+               memcpy(&ddr_cfg_regs, &ddr_cfg_regs_533, sizeof(ddr_cfg_regs));
        else if(sysinfo.freqDDRBus <= DATARATE_667MHZ)
-               ddr_cfg_regs = &ddr_cfg_regs_667;
+               memcpy(&ddr_cfg_regs, &ddr_cfg_regs_667, sizeof(ddr_cfg_regs));
        else if(sysinfo.freqDDRBus <= DATARATE_800MHZ)
-               ddr_cfg_regs = &ddr_cfg_regs_800;
+               memcpy(&ddr_cfg_regs, &ddr_cfg_regs_800, sizeof(ddr_cfg_regs));
        else
                panic("Unsupported DDR data rate %s MT/s data rate\n",
                                        strmhz(buf, sysinfo.freqDDRBus));
@@ -235,14 +235,14 @@ phys_size_t fixed_sdram (void)
        /* P1020 and it's derivatives support max 32bit DDR width */
        if(cpu->soc_ver == SVR_P1020 || cpu->soc_ver == SVR_P1020_E ||
                cpu->soc_ver == SVR_P1011 || cpu->soc_ver == SVR_P1011_E) {
-               ddr_cfg_regs->ddr_sdram_cfg |= SDRAM_CFG_32_BE;
-               ddr_cfg_regs->cs[0].bnds = 0x0000001F;
+               ddr_cfg_regs.ddr_sdram_cfg |= SDRAM_CFG_32_BE;
+               ddr_cfg_regs.cs[0].bnds = 0x0000001F;
                ddr_size = (CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 / 2);
        }
        else
                ddr_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
 
-       fsl_ddr_set_memctl_regs(ddr_cfg_regs, 0);
+       fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0);
 
        return ddr_size;
 }
-- 
1.5.6.5

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot