diff options
Diffstat (limited to 'drivers/ddr')
-rw-r--r-- | drivers/ddr/altera/sdram_gen5.c | 4 | ||||
-rw-r--r-- | drivers/ddr/fsl/lc_common_dimm_params.c | 6 | ||||
-rw-r--r-- | drivers/ddr/fsl/main.c | 6 | ||||
-rw-r--r-- | drivers/ddr/imx/imx8m/Makefile | 2 | ||||
-rw-r--r-- | drivers/ddr/imx/imx8ulp/Makefile | 2 | ||||
-rw-r--r-- | drivers/ddr/imx/imx9/Makefile | 2 | ||||
-rw-r--r-- | drivers/ddr/imx/phy/Makefile | 2 | ||||
-rw-r--r-- | drivers/ddr/marvell/a38x/Makefile | 44 | ||||
-rw-r--r-- | drivers/ddr/marvell/a38x/old/Makefile | 28 | ||||
-rw-r--r-- | drivers/ddr/marvell/axp/Makefile | 20 |
10 files changed, 58 insertions, 58 deletions
diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 46c53e7c7a3..3c79bb11802 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -20,7 +20,7 @@ #include "sequencer.h" -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD struct altera_gen5_sdram_priv { struct ram_info info; @@ -651,4 +651,4 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; -#endif /* CONFIG_SPL_BUILD */ +#endif /* CONFIG_XPL_BUILD */ diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c index cc128112e4f..9c5b108267a 100644 --- a/drivers/ddr/fsl/lc_common_dimm_params.c +++ b/drivers/ddr/fsl/lc_common_dimm_params.c @@ -409,18 +409,18 @@ compute_lowest_common_dimm_parameters(const unsigned int ctrl_num, if (dimm_params[i].n_ranks) { if (dimm_params[i].registered_dimm) { temp1 = 1; -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD printf("Detected RDIMM %s\n", dimm_params[i].mpart); #endif } else { temp2 = 1; -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD printf("Detected UDIMM %s\n", dimm_params[i].mpart); #endif } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD puts(" "); #endif } diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index 888dfb7ff33..d59e94779ff 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -863,16 +863,16 @@ phys_size_t __fsl_ddr_sdram(fsl_ddr_info_t *pinfo) if ((first_ctrl == 0) && (total_memory - 1 > (phys_size_t)~0ULL)) { puts("Detected "); print_size(total_memory, " of memory\n"); -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD puts(" "); /* re-align to match init_dram print */ #endif puts("This U-Boot only supports <= "); print_size((unsigned long long)((phys_size_t)~0ULL)+1, " of DDR\n"); -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD puts(" "); /* re-align to match init_dram print */ #endif puts("You could rebuild it with CONFIG_PHYS_64BIT\n"); -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD puts(" "); /* re-align to match init_dram print */ #endif } diff --git a/drivers/ddr/imx/imx8m/Makefile b/drivers/ddr/imx/imx8m/Makefile index aed91dc23f4..883e6e1b0d7 100644 --- a/drivers/ddr/imx/imx8m/Makefile +++ b/drivers/ddr/imx/imx8m/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-$(CONFIG_IMX8M_DRAM) += ddr_init.o obj-y += ../phy/ endif diff --git a/drivers/ddr/imx/imx8ulp/Makefile b/drivers/ddr/imx/imx8ulp/Makefile index 7f44a92180f..4f2ad32351c 100644 --- a/drivers/ddr/imx/imx8ulp/Makefile +++ b/drivers/ddr/imx/imx8ulp/Makefile @@ -4,6 +4,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-$(CONFIG_IMX8ULP_DRAM) += ddr_init.o endif diff --git a/drivers/ddr/imx/imx9/Makefile b/drivers/ddr/imx/imx9/Makefile index 9403f988b32..6c9506055b8 100644 --- a/drivers/ddr/imx/imx9/Makefile +++ b/drivers/ddr/imx/imx9/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-$(CONFIG_IMX9_DRAM) += ddr_init.o obj-y += ../phy/ endif diff --git a/drivers/ddr/imx/phy/Makefile b/drivers/ddr/imx/phy/Makefile index bb3d4ee5b74..592d0c6ebad 100644 --- a/drivers/ddr/imx/phy/Makefile +++ b/drivers/ddr/imx/phy/Makefile @@ -4,6 +4,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-$(CONFIG_IMX_SNPS_DDR_PHY) += helper.o ddrphy_utils.o ddrphy_train.o ddrphy_csr.o endif diff --git a/drivers/ddr/marvell/a38x/Makefile b/drivers/ddr/marvell/a38x/Makefile index 4e8a9d190d7..f49d009920e 100644 --- a/drivers/ddr/marvell/a38x/Makefile +++ b/drivers/ddr/marvell/a38x/Makefile @@ -1,29 +1,29 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-$(CONFIG_SPL_BUILD) += mv_ddr_plat.o -obj-$(CONFIG_SPL_BUILD) += mv_ddr_sys_env_lib.o -obj-$(CONFIG_SPL_BUILD) += ddr3_debug.o -obj-$(CONFIG_SPL_BUILD) += ddr3_init.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_bist.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_centralization.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_db.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_hw_algo.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_ip_engine.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_leveling.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_pbs.o -obj-$(CONFIG_SPL_BUILD) += mv_ddr_build_message.o -obj-$(CONFIG_SPL_BUILD) += mv_ddr_common.o -obj-$(CONFIG_SPL_BUILD) += mv_ddr_spd.o -obj-$(CONFIG_SPL_BUILD) += mv_ddr_topology.o -obj-$(CONFIG_SPL_BUILD) += xor.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_plat.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_sys_env_lib.o +obj-$(CONFIG_XPL_BUILD) += ddr3_debug.o +obj-$(CONFIG_XPL_BUILD) += ddr3_init.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_bist.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_centralization.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_db.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_hw_algo.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_ip_engine.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_leveling.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_pbs.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_build_message.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_common.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_spd.o +obj-$(CONFIG_XPL_BUILD) += mv_ddr_topology.o +obj-$(CONFIG_XPL_BUILD) += xor.o obj-$(CONFIG_ARMADA_38X_SUPPORT_OLD_DDR3_TRAINING) += old/ ifdef CONFIG_DDR4 - obj-$(CONFIG_SPL_BUILD) += mv_ddr4_mpr_pda_if.o - obj-$(CONFIG_SPL_BUILD) += mv_ddr4_training.o - obj-$(CONFIG_SPL_BUILD) += mv_ddr4_training_calibration.o - obj-$(CONFIG_SPL_BUILD) += mv_ddr4_training_db.o - obj-$(CONFIG_SPL_BUILD) += mv_ddr4_training_leveling.o + obj-$(CONFIG_XPL_BUILD) += mv_ddr4_mpr_pda_if.o + obj-$(CONFIG_XPL_BUILD) += mv_ddr4_training.o + obj-$(CONFIG_XPL_BUILD) += mv_ddr4_training_calibration.o + obj-$(CONFIG_XPL_BUILD) += mv_ddr4_training_db.o + obj-$(CONFIG_XPL_BUILD) += mv_ddr4_training_leveling.o endif diff --git a/drivers/ddr/marvell/a38x/old/Makefile b/drivers/ddr/marvell/a38x/old/Makefile index 1645a79b405..c9bc746cc2b 100644 --- a/drivers/ddr/marvell/a38x/old/Makefile +++ b/drivers/ddr/marvell/a38x/old/Makefile @@ -2,20 +2,20 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_SPL_BUILD) += ddr3_a38x.o -obj-$(CONFIG_SPL_BUILD) += ddr3_a38x_training.o -obj-$(CONFIG_SPL_BUILD) += ddr3_debug.o -obj-$(CONFIG_SPL_BUILD) += ddr3_hws_hw_training.o -obj-$(CONFIG_SPL_BUILD) += ddr3_init.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_bist.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_centralization.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_db.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_hw_algo.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_ip_engine.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_leveling.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_pbs.o -obj-$(CONFIG_SPL_BUILD) += ddr3_training_static.o +obj-$(CONFIG_XPL_BUILD) += ddr3_a38x.o +obj-$(CONFIG_XPL_BUILD) += ddr3_a38x_training.o +obj-$(CONFIG_XPL_BUILD) += ddr3_debug.o +obj-$(CONFIG_XPL_BUILD) += ddr3_hws_hw_training.o +obj-$(CONFIG_XPL_BUILD) += ddr3_init.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_bist.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_centralization.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_db.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_hw_algo.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_ip_engine.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_leveling.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_pbs.o +obj-$(CONFIG_XPL_BUILD) += ddr3_training_static.o define IncludeSymbolRename CFLAGS_$(1) = -include $(srctree)/drivers/ddr/marvell/a38x/old/glue_symbol_renames.h diff --git a/drivers/ddr/marvell/axp/Makefile b/drivers/ddr/marvell/axp/Makefile index d04d9a21db2..01e427296e6 100644 --- a/drivers/ddr/marvell/axp/Makefile +++ b/drivers/ddr/marvell/axp/Makefile @@ -1,12 +1,12 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-$(CONFIG_SPL_BUILD) += ddr3_dfs.o -obj-$(CONFIG_SPL_BUILD) += ddr3_dqs.o -obj-$(CONFIG_SPL_BUILD) += ddr3_hw_training.o -obj-$(CONFIG_SPL_BUILD) += ddr3_init.o -obj-$(CONFIG_SPL_BUILD) += ddr3_pbs.o -obj-$(CONFIG_SPL_BUILD) += ddr3_read_leveling.o -obj-$(CONFIG_SPL_BUILD) += ddr3_sdram.o -obj-$(CONFIG_SPL_BUILD) += ddr3_spd.o -obj-$(CONFIG_SPL_BUILD) += ddr3_write_leveling.o -obj-$(CONFIG_SPL_BUILD) += xor.o +obj-$(CONFIG_XPL_BUILD) += ddr3_dfs.o +obj-$(CONFIG_XPL_BUILD) += ddr3_dqs.o +obj-$(CONFIG_XPL_BUILD) += ddr3_hw_training.o +obj-$(CONFIG_XPL_BUILD) += ddr3_init.o +obj-$(CONFIG_XPL_BUILD) += ddr3_pbs.o +obj-$(CONFIG_XPL_BUILD) += ddr3_read_leveling.o +obj-$(CONFIG_XPL_BUILD) += ddr3_sdram.o +obj-$(CONFIG_XPL_BUILD) += ddr3_spd.o +obj-$(CONFIG_XPL_BUILD) += ddr3_write_leveling.o +obj-$(CONFIG_XPL_BUILD) += xor.o |