From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sat, 6 Jan 2018 13:59:26 +0000 (+0900)
Subject: ARM: uniphier: hide memory top by platform hook instead of CONFIG
X-Git-Tag: v2018.03-rc1~240^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a322eb9ff6f4c43d378b683457bdbfc59c1c19a6;p=oweals%2Fu-boot.git

ARM: uniphier: hide memory top by platform hook instead of CONFIG

I do not see a good reason to do this by a CONFIG option that affects
all SoCs.  The ram_size can be adjusted by dram_init() at run-time.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index cb35dabfec..f678114251 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -238,6 +238,13 @@ int dram_init(void)
 		gd->ram_size += dram_map[i].size;
 	}
 
+	/*
+	 * LD20 uses the last 64 byte for each channel for dynamic
+	 * DDR PHY training
+	 */
+	if (uniphier_get_soc_id() == UNIPHIER_LD20_ID)
+		gd->ram_size -= 64;
+
 	return 0;
 }
 
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 12cbe9b79d..5ab06f6072 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -215,8 +215,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_NR_DRAM_BANKS		3
-/* for LD20; the last 64 byte is used for dynamic DDR PHY training */
-#define CONFIG_SYS_MEM_TOP_HIDE		64
 
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE)