diff mbox

[U-Boot,v2,2/2] ARM: highbank: remove DRAM bank setup

Message ID 1434842995-25884-2-git-send-email-osp@andrep.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Andre Przywara June 20, 2015, 11:29 p.m. UTC 
From: Rob Herring <robh@kernel.org>

On the highbank platform the SoC's management controller firmware
will probe the DRAM modules and populates the initial device tree with
the correct values. Therefore the memory sizes in the DT are already
correct, so remove U-Boot's DRAM bank setup so the memory node is not
"fixed up" by u-boot.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Andre Przywara <osp@andrep.de>
---
 board/highbank/highbank.c  | 6 ------
 include/configs/highbank.h | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Tom Rini Aug. 13, 2015, 1:16 p.m. UTC | #1 
On Sun, Jun 21, 2015 at 12:29:55AM +0100, Andre Przywara wrote:

> From: Rob Herring <robh@kernel.org>
> 
> On the highbank platform the SoC's management controller firmware
> will probe the DRAM modules and populates the initial device tree with
> the correct values. Therefore the memory sizes in the DT are already
> correct, so remove U-Boot's DRAM bank setup so the memory node is not
> "fixed up" by u-boot.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Andre Przywara <osp@andrep.de>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 469ee8e..55999ed 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -96,12 +96,6 @@  int dram_init(void)
 	return 0;
 }
 
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-	gd->bd->bi_dram[0].size =  PHYS_SDRAM_1_SIZE;
-}
-
 #if defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *fdt, bd_t *bd)
 {
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 08dcdf8..0c5f927 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -80,8 +80,9 @@ 
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
+ * The DRAM is already setup, so do not touch the DT node later.
  */
-#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_NR_DRAM_BANKS		0
 #define PHYS_SDRAM_1_SIZE		(4089 << 20)
 #define CONFIG_SYS_MEMTEST_START	0x100000
 #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM_1_SIZE - 0x100000)