From 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Jan 2023 11:19:45 -0500 Subject: global: Finish CONFIG -> CFG migration At this point, the remaining places where we have a symbol that is defined as CONFIG_... are in fairly odd locations. While as much dead code has been removed as possible, some of these locations are simply less obvious at first. In other cases, this code is used, but was defined in such a way as to have been missed by earlier checks. Perform a rename of all such remaining symbols to be CFG_... rather than CONFIG_... Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- drivers/ddr/fsl/options.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/ddr/fsl/options.c') 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; -- cgit v1.2.3