diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-31 18:44:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-31 18:44:31 -0500 |
| commit | 48f58a59737739b0f96ceba9f7873178c6d917bf (patch) | |
| tree | edbd91290eefd0cd53a1b6af65cd255e57ff5c2e /drivers/ddr/fsl/options.c | |
| parent | 2e87980580d0bf4781ad0d63efd456aa1a73d03f (diff) | |
| parent | 58932ec68cdcd574c85620e285a7b95a49551603 (diff) | |
| download | u-boot-48f58a59737739b0f96ceba9f7873178c6d917bf.tar.gz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/ddr/fsl/options.c')
| -rw-r--r-- | drivers/ddr/fsl/options.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index a7eaed1bd7..85ec48c28e 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -1,5 +1,6 @@ /* - * Copyright 2008, 2010-2014 Freescale Semiconductor, Inc. + * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc. + * Copyright 2017-2018 NXP Semiconductor * * SPDX-License-Identifier: GPL-2.0+ */ @@ -749,7 +750,9 @@ unsigned int populate_memctl_options(const common_timing_params_t *common_dimm, defined(CONFIG_SYS_FSL_DDR4) const struct dynamic_odt *pdodt = odt_unknown; #endif +#if (CONFIG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) ulong ddr_freq; +#endif /* * Extract hwconfig from environment since we have not properly setup @@ -1292,6 +1295,9 @@ done: if (pdimm[0].n_ranks == 4) popts->quad_rank_present = 1; + popts->package_3ds = pdimm->package_3ds; + +#if (CONFIG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) ddr_freq = get_ddr_freq(ctrl_num) / 1000000; if (popts->registered_dimm_en) { popts->rcw_override = 1; @@ -1305,6 +1311,7 @@ done: else popts->rcw_2 = 0x00300000; } +#endif fsl_ddr_board_options(popts, pdimm, ctrl_num); |