From: York Sun <yorksun@freescale.com>
Date: Mon, 28 Oct 2013 23:36:02 +0000 (-0700)
Subject: Driver/DDR: Update DDR driver to allow non-zero base address
X-Git-Tag: v2014.01-rc2~57^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00ec3fd21170e463e29723976d37f8ea2316f168;p=oweals%2Fu-boot.git

Driver/DDR: Update DDR driver to allow non-zero base address

The DRAM base has been zero for Power SoCs. It could be non-zero
for ARM SoCs. Use a macro instead of hard-coding to zero.

Signed-off-by: York Sun <yorksun@freescale.com>
---

diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index b4988e194c..d0cd58925c 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -255,7 +255,7 @@ static unsigned long long __step_assign_addresses(fsl_ddr_info_t *pinfo,
 		debug("dbw_cap_adj[%d]=%d\n", i, dbw_cap_adj[i]);
 	}
 
-	current_mem_base = 0ull;
+	current_mem_base = CONFIG_SYS_DDR_SDRAM_BASE;
 	total_mem = 0;
 	if (pinfo->memctl_opts[0].memctl_interleaving) {
 		rank_density = pinfo->dimm_params[0][0].rank_density >>
@@ -535,8 +535,8 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,
 			}
 		}
 
-		total_mem = 1 + (((unsigned long long)max_end << 24ULL)
-				    | 0xFFFFFFULL);
+		total_mem = 1 + (((unsigned long long)max_end << 24ULL) |
+			    0xFFFFFFULL) - CONFIG_SYS_DDR_SDRAM_BASE;
 	}
 
 	return total_mem;