leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ddr: altera: stratix10: Move SDRAM size check to SDRAM driver

Browse Source 
Move SDRAM size check to SDRAM driver. sdram_calculate_size()
is called in SDRAM initialization already, avoid calling
twice in size check function.

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
This commit is contained in:
Ley Foon Tan 2019-03-22 01:24:00 +08:00 committed by Marek Vasut
parent c5de2b7eae
commit b6f7ee5d1f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-socfpga/spl_s10.c
View File

@ -181,17 +181,6 @@ void board_init_f(ulong dummy)
hang(); hang();
} }
gd->ram_size = sdram_calculate_size();
printf("DDR: %d MiB\n", (int)(gd->ram_size >> 20));
/* Sanity check ensure correct SDRAM size specified */
debug("DDR: Running SDRAM size sanity check\n");
if (get_ram_size(0, gd->ram_size) != gd->ram_size) {
puts("DDR: SDRAM size check failed!\n");
hang();
}
debug("DDR: SDRAM size check passed!\n");
mbox_init(); mbox_init();
#ifdef CONFIG_CADENCE_QSPI #ifdef CONFIG_CADENCE_QSPI

15
drivers/ddr/altera/sdram_s10.c
View File

@ -134,6 +134,17 @@ static int poll_hmc_clock_status(void)
SYSMGR_HMC_CLK_STATUS_MSK, true, 1000, false); SYSMGR_HMC_CLK_STATUS_MSK, true, 1000, false);
} }
static void sdram_size_check(void)
{
/* Sanity check ensure correct SDRAM size specified */
debug("DDR: Running SDRAM size sanity check\n");
if (get_ram_size(0, gd->ram_size) != gd->ram_size) {
puts("DDR: SDRAM size check failed!\n");
hang();
}
debug("DDR: SDRAM size check passed!\n");
}
/** /**
* sdram_mmr_init_full() - Function to initialize SDRAM MMR * sdram_mmr_init_full() - Function to initialize SDRAM MMR
* *
@ -339,6 +350,8 @@ int sdram_mmr_init_full(unsigned int unused)
else else
gd->ram_size = size; gd->ram_size = size;
printf("DDR: %lld MiB\n", gd->ram_size >> 20);
/* Enable or disable the SDRAM ECC */ /* Enable or disable the SDRAM ECC */
if (CTRLCFG1_CFG_CTRL_EN_ECC(ctrlcfg1)) { if (CTRLCFG1_CFG_CTRL_EN_ECC(ctrlcfg1)) {
setbits_le32(SOCFPGA_SDR_ADDRESS + ECCCTRL1, setbits_le32(SOCFPGA_SDR_ADDRESS + ECCCTRL1,
@ -361,6 +374,8 @@ int sdram_mmr_init_full(unsigned int unused)
DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); DDR_HMC_ECCCTL2_AWB_EN_SET_MSK));
} }
sdram_size_check();
debug("DDR: HMC init success\n"); debug("DDR: HMC init success\n");
return 0; return 0;
} }