ARM: highbank: remove DRAM bank setup

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>

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 469ee8e114663a3a2006d429db450382242f119c..55999ed2266bcb4045dc3975dcafbb18955a4ed1 100644 (file)
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -96,12 +96,6 @@ int dram_init(void)
        return 0;
 }
 
        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)
 {
 #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 86823e235c6925d2cafe86102acba14b7b9e635b..7f331a6a73cdc5975dd9be2a6bdc74787476ac11 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -75,8 +75,9 @@
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
 
 /*-----------------------------------------------------------------------
  * 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)
 #define PHYS_SDRAM_1_SIZE              (4089 << 20)
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1_SIZE - 0x100000)