commit 088454cde245b4d431ce0181be8b3cbceea059d6
author Simon Glass <sjg@chromium.org> Fri Mar 31 08:40:25 2017 -0600
committer Tom Rini <trini@konsulko.com> Wed Apr 05 13:59:20 2017 -0400
tree ec86ebe66961c9b06ab4b39ec83fd81d4a86e9be
parent 52c411805c090999f015df8bdf8016fb684746d0

board_f: Drop return value from initdram()

At present we cannot use this function as an init sequence call without a
wrapper, since it returns the RAM size. Adjust it to set the RAM size in
global_data instead, and return 0 on success.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>

board/tqc/tqm5200/tqm5200.c

diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index 1e843d5..baf3208 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -133,7 +133,7 @@
  *	      is something else than 0x00000000.
  */
 
-phys_size_t initdram(void)
+int initdram(void)
 {
 	ulong dramsize = 0;
 	ulong dramsize2 = 0;
@@ -252,10 +252,12 @@
 	}
 
 #if defined(CONFIG_TQM5200_B)
-	return dramsize + dramsize2;
+	gd->ram_size = dramsize + dramsize2;
 #else
-	return dramsize;
+	gd->ram_size = dramsize;
 #endif /* CONFIG_TQM5200_B */
+
+	return 0;
 }
 
 int checkboard (void)

board/tqc/tqm834x/tqm834x.c

diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index a05ae2a..0968e49 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -66,7 +66,7 @@
 /**************************************************************************
  * DRAM initalization and size detection
  */
-phys_size_t initdram(void)
+int initdram(void)
 {
 	long bank_size;
 	long size;
@@ -112,7 +112,9 @@
 		if(size < DDR_MAX_SIZE_PER_CS) break;
 	}
 
-	return size;
+	gd->ram_size = size;
+
+	return 0;
 }
 
 /**************************************************************************

board/tqc/tqm8xx/tqm8xx.c

diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index 9935730..489a22c 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -126,7 +126,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-phys_size_t initdram(void)
+int initdram(void)
 {
 	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
@@ -390,7 +390,9 @@
 	memctl->memc_or5 = CONFIG_SYS_OR5_ISP1362;
 	memctl->memc_br5 = CONFIG_SYS_BR5_ISP1362;
 #endif							/* CONFIG_ISP1362_USB */
-	return (size_b0 + size_b1);
+	gd->ram_size = size_b0 + size_b1;
+
+	return 0;
 }
 
 /* ------------------------------------------------------------------------- */