diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/ddr/fsl/options.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'drivers/ddr/fsl/options.c')
| -rw-r--r-- | drivers/ddr/fsl/options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index 9555b9a29d4..7cff8234584 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -753,7 +753,7 @@ 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) +#if (CFG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) ulong ddr_freq; #endif @@ -1024,7 +1024,7 @@ unsigned int populate_memctl_options(const common_timing_params_t *common_dimm, if (hwconfig_sub_f("fsl_ddr", "parity", buf)) { if (hwconfig_subarg_cmp_f("fsl_ddr", "parity", "on", buf)) { if (popts->registered_dimm_en || - (CONFIG_FSL_SDRAM_TYPE == SDRAM_TYPE_DDR4)) + (CFG_FSL_SDRAM_TYPE == SDRAM_TYPE_DDR4)) popts->ap_en = 1; } } @@ -1302,7 +1302,7 @@ done: popts->package_3ds = pdimm->package_3ds; -#if (CONFIG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) +#if (CFG_FSL_SDRAM_TYPE != SDRAM_TYPE_DDR4) ddr_freq = get_ddr_freq(ctrl_num) / 1000000; if (popts->registered_dimm_en) { popts->rcw_override = 1; |