aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu/arm64-common.c
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2020-04-08 19:25:18 +0200
committerStefan Roese <sr@denx.de>2020-04-14 13:16:42 +0200
commitf075b425a72c095a1e11ff855c3ba8b060feec20 (patch)
tree0a6b89494e2eba28dd62e6c71cb4ce76ce72ae6e /arch/arm/mach-mvebu/arm64-common.c
parentc8a185a823d7aa8fc02df0c064d47e5713eaebc6 (diff)
downloadu-boot-f075b425a72c095a1e11ff855c3ba8b060feec20.zip
u-boot-f075b425a72c095a1e11ff855c3ba8b060feec20.tar.gz
u-boot-f075b425a72c095a1e11ff855c3ba8b060feec20.tar.bz2
arm64: mvebu: armada-8k: move dram init code
Move Armada-8k specific DRAM init code into armada-8k specific directory. Signed-off-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/arm/mach-mvebu/arm64-common.c')
-rw-r--r--arch/arm/mach-mvebu/arm64-common.c46
1 files changed, 2 insertions, 44 deletions
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
index 40b98db..244ea49 100644
--- a/arch/arm/mach-mvebu/arm64-common.c
+++ b/arch/arm/mach-mvebu/arm64-common.c
@@ -45,54 +45,12 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void)
return NULL;
}
-/* DRAM init code ... */
-
-#define MV_SIP_DRAM_SIZE 0x82000010
-
-static u64 a8k_dram_scan_ap_sz(void)
-{
- struct pt_regs pregs;
-
- pregs.regs[0] = MV_SIP_DRAM_SIZE;
- pregs.regs[1] = SOC_REGS_PHY_BASE;
- smc_call(&pregs);
-
- return pregs.regs[0];
-}
-
-static void a8k_dram_init_banksize(void)
-{
- /*
- * The firmware (ATF) leaves a 1G whole above the 3G mark for IO
- * devices. Higher RAM is mapped at 4G.
- *
- * Config 2 DRAM banks:
- * Bank 0 - max size 4G - 1G
- * Bank 1 - ram size - 4G + 1G
- */
- phys_size_t max_bank0_size = SZ_4G - SZ_1G;
-
- gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
- if (gd->ram_size <= max_bank0_size) {
- gd->bd->bi_dram[0].size = gd->ram_size;
- return;
- }
-
- gd->bd->bi_dram[0].size = max_bank0_size;
- if (CONFIG_NR_DRAM_BANKS > 1) {
- gd->bd->bi_dram[1].start = SZ_4G;
- gd->bd->bi_dram[1].size = gd->ram_size - max_bank0_size;
- }
-}
-
__weak int dram_init_banksize(void)
{
if (CONFIG_IS_ENABLED(ARMADA_8K))
- a8k_dram_init_banksize();
+ return a8k_dram_init_banksize();
else
- fdtdec_setup_memory_banksize();
-
- return 0;
+ return fdtdec_setup_memory_banksize();
}
__weak int dram_init(void)