summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-06-21 00:29:55 +0100
committerTom Rini <trini@konsulko.com>2015-08-12 12:08:19 -0400
commit32b4a8a2a5aff307b24ec8e41a82f715ca4a6aab (patch)
treef94d66118b01aa29193277d027b2560b1f901868
parente6b606d6572893a9f6fb6339b6a09a4b6942f989 (diff)
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>
-rw-r--r--board/highbank/highbank.c6
-rw-r--r--include/configs/highbank.h3
2 files changed, 2 insertions, 7 deletions
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 469ee8e114..55999ed226 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 86823e235c..7f331a6a73 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -75,8 +75,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)