From: Patrick Delaunay <patrick.delaunay@st.com>
Date: Thu, 25 Jan 2018 17:07:46 +0000 (+0100)
Subject: common/memsize.c: restore content of the base address
X-Git-Tag: v2018.05-rc1~94
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=218da804ef0971ecee8063c45deae0345e344812;p=u-boot

common/memsize.c: restore content of the base address

For the last return of function get_ram_size(),
when size=maxsize, restore the base address (*base)
content.

Add comment for the remaining case to avoid regression:
this case is already correctly handled.

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

diff --git a/common/memsize.c b/common/memsize.c
index 6dc4bb21b0..c31527567c 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -77,9 +77,16 @@ long get_ram_size(long *base, long maxsize)
 				addr  = base + cnt;
 				*addr = save[--i];
 			}
+			/* warning: don't restore save_base in this case,
+			 * it is already done in the loop because
+			 * base and base+size share the same physical memory
+			 * and *base is saved after *(base+size) modification
+			 * in first loop
+			 */
 			return (size);
 		}
 	}
+	*base = save_base;
 
 	return (maxsize);
 }