From: Patrick Delaunay <patrick.delaunay@st.com>
Date: Thu, 25 Jan 2018 17:07:45 +0000 (+0100)
Subject: common/memsize.c: prepare get_ram_size update
X-Git-Tag: v2018.05-rc1~95
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c5da05cd412e1656fe3d1909966013fc121c5c5c;p=oweals%2Fu-boot.git

common/memsize.c: prepare get_ram_size update

Save the content of the base address in a new variable
in stack (save_base) to prepare restore this content.

This patch don't modified code behavior and stack usage.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

diff --git a/common/memsize.c b/common/memsize.c
index 0fb9ba57b6..6dc4bb21b0 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -27,7 +27,8 @@ DECLARE_GLOBAL_DATA_PTR;
 long get_ram_size(long *base, long maxsize)
 {
 	volatile long *addr;
-	long           save[32];
+	long           save[31];
+	long           save_base;
 	long           cnt;
 	long           val;
 	long           size;
@@ -43,7 +44,7 @@ long get_ram_size(long *base, long maxsize)
 
 	addr = base;
 	sync();
-	save[i] = *addr;
+	save_base = *addr;
 	sync();
 	*addr = 0;
 
@@ -51,7 +52,7 @@ long get_ram_size(long *base, long maxsize)
 	if ((val = *addr) != 0) {
 		/* Restore the original data before leaving the function. */
 		sync();
-		*addr = save[i];
+		*base = save_base;
 		for (cnt = 1; cnt < maxsize / sizeof(long); cnt <<= 1) {
 			addr  = base + cnt;
 			sync();