diff options
Diffstat (limited to 'board/freescale')
73 files changed, 110 insertions, 110 deletions
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index b4faf6f9e0a..c2c86c0dd08 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -5,7 +5,7 @@ MINIMAL= -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD ifndef CONFIG_TPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y @@ -29,14 +29,14 @@ endif obj-$(CONFIG_FSL_CADMUS) += cadmus.o obj-$(CONFIG_FSL_VIA) += cds_via.o obj-$(CONFIG_FMAN_ENET) += fman.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-$(CONFIG_FSL_NGPIXIS) += ngpixis.o endif obj-$(I2C_COMMON) += i2c_common.o obj-$(CONFIG_FSL_USE_PCA9547_MUX) += i2c_mux.o -obj-$(CONFIG_$(SPL_)VID) += vid.o +obj-$(CONFIG_$(XPL_)VID) += vid.o obj-$(CONFIG_FSL_QIXIS) += qixis.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o endif ifndef CONFIG_RAMBOOT_PBL @@ -54,7 +54,7 @@ obj-$(CONFIG_TARGET_MPC8548CDS) += cds_pci_ft.o obj-$(CONFIG_TARGET_P3041DS) += ics307_clk.o obj-$(CONFIG_TARGET_P4080DS) += ics307_clk.o obj-$(CONFIG_TARGET_P5040DS) += ics307_clk.o -ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y) +ifeq ($(CONFIG_$(XPL_)POWER_LEGACY),y) obj-$(CONFIG_POWER_PFUZE100) += pfuze.o endif obj-$(CONFIG_DM_PMIC_PFUZE100) += pfuze.o diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index 3344653ba2d..7629d7091e9 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -23,7 +23,7 @@ loop: return 0; } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD static int do_esbc_validate(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 27a33924c84..194a0907e72 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -15,7 +15,7 @@ #include <dm/root.h> #include <asm/fsl_secure_boot.h> -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK) +#if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_FRAMEWORK) #include <spl.h> #endif @@ -67,7 +67,7 @@ int fsl_check_boot_mode_secure(void) return 0; } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD int fsl_setenv_chain_of_trust(void) { /* Check Boot Mode @@ -92,7 +92,7 @@ int fsl_setenv_chain_of_trust(void) } #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr) { int res; @@ -157,4 +157,4 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) image_entry(); } #endif /* ifdef CONFIG_SPL_FRAMEWORK */ -#endif /* ifdef CONFIG_SPL_BUILD */ +#endif /* ifdef CONFIG_XPL_BUILD */ diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 657f4533bcd..df0c1a1f406 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -396,7 +396,7 @@ static void fsl_secboot_bootscript_parse_failure(void) */ void fsl_secboot_handle_error(int error) { -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD const struct fsl_secboot_errcode *e; for (e = fsl_secboot_errcodes; e->errcode != ERROR_ESBC_CLIENT_MAX; @@ -807,7 +807,7 @@ static int calculate_cmp_img_sig(struct fsl_secboot_img_priv *img) prop.num_bits = key_len * 8; prop.exp_len = key_len; -#if defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_XPL_BUILD) ret = device_bind_driver(NULL, "fsl_rsa_mod_exp", "fsl_rsa_mod_exp", NULL); if (ret) { printf("Couldn't bind fsl_rsa_mod_exp driver (%d)\n", ret); diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c index 6400ac05245..7815ba2dbce 100644 --- a/board/freescale/common/qixis.c +++ b/board/freescale/common/qixis.c @@ -161,7 +161,7 @@ void board_deassert_mem_reset(void) } #endif -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD static void qixis_reset(void) { QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET); diff --git a/board/freescale/imx8mm_evk/Makefile b/board/freescale/imx8mm_evk/Makefile index 1db7b62cafc..9fecd8dd8cb 100644 --- a/board/freescale/imx8mm_evk/Makefile +++ b/board/freescale/imx8mm_evk/Makefile @@ -6,7 +6,7 @@ obj-y += imx8mm_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o endif diff --git a/board/freescale/imx8mn_evk/Makefile b/board/freescale/imx8mn_evk/Makefile index 42d1179724d..5ef666a36dd 100644 --- a/board/freescale/imx8mn_evk/Makefile +++ b/board/freescale/imx8mn_evk/Makefile @@ -6,7 +6,7 @@ obj-y += imx8mn_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_ld.o diff --git a/board/freescale/imx8mp_evk/Makefile b/board/freescale/imx8mp_evk/Makefile index 106bf9a1edf..3c154d7f7f5 100644 --- a/board/freescale/imx8mp_evk/Makefile +++ b/board/freescale/imx8mp_evk/Makefile @@ -6,7 +6,7 @@ obj-y += imx8mp_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o endif diff --git a/board/freescale/imx8mq_evk/Makefile b/board/freescale/imx8mq_evk/Makefile index cf046963d25..ca449e6f369 100644 --- a/board/freescale/imx8mq_evk/Makefile +++ b/board/freescale/imx8mq_evk/Makefile @@ -6,7 +6,7 @@ obj-y += imx8mq_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o lpddr4_timing_b0.o endif diff --git a/board/freescale/imx8qm_mek/Makefile b/board/freescale/imx8qm_mek/Makefile index bc9a1260bde..53b33a0dfb1 100644 --- a/board/freescale/imx8qm_mek/Makefile +++ b/board/freescale/imx8qm_mek/Makefile @@ -5,4 +5,4 @@ # obj-y += imx8qm_mek.o -obj-$(CONFIG_SPL_BUILD) += spl.o +obj-$(CONFIG_XPL_BUILD) += spl.o diff --git a/board/freescale/imx8qxp_mek/Makefile b/board/freescale/imx8qxp_mek/Makefile index acaadcd84a4..459ec771eea 100644 --- a/board/freescale/imx8qxp_mek/Makefile +++ b/board/freescale/imx8qxp_mek/Makefile @@ -5,4 +5,4 @@ # obj-y += imx8qxp_mek.o -obj-$(CONFIG_SPL_BUILD) += spl.o +obj-$(CONFIG_XPL_BUILD) += spl.o diff --git a/board/freescale/imx8ulp_evk/Makefile b/board/freescale/imx8ulp_evk/Makefile index 1cf148ab910..7819b2675b3 100644 --- a/board/freescale/imx8ulp_evk/Makefile +++ b/board/freescale/imx8ulp_evk/Makefile @@ -2,7 +2,7 @@ obj-y += imx8ulp_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o ifdef CONFIG_IMX8ULP_ND_MODE obj-y += lpddr4_timing_264.o diff --git a/board/freescale/imx93_evk/Makefile b/board/freescale/imx93_evk/Makefile index ede8d20ff5c..b077acc70a5 100644 --- a/board/freescale/imx93_evk/Makefile +++ b/board/freescale/imx93_evk/Makefile @@ -6,7 +6,7 @@ obj-y += imx93_evk.o -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o obj-$(CONFIG_IMX93_EVK_LPDDR4X) += lpddr4x_timing.o lpddr4x_timing_1866mts.o endif diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c index 42a0a67ae93..11dbef84688 100644 --- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c +++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c @@ -37,7 +37,7 @@ int dram_init_banksize(void) return fdtdec_setup_memory_banksize(); } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c index 46a644908e9..056489932ac 100644 --- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c +++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c @@ -37,7 +37,7 @@ int dram_init_banksize(void) return fdtdec_setup_memory_banksize(); } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/freescale/imxrt1170-evk/imxrt1170-evk.c b/board/freescale/imxrt1170-evk/imxrt1170-evk.c index e10b8830ec6..047aea8181a 100644 --- a/board/freescale/imxrt1170-evk/imxrt1170-evk.c +++ b/board/freescale/imxrt1170-evk/imxrt1170-evk.c @@ -37,7 +37,7 @@ int dram_init_banksize(void) return fdtdec_setup_memory_banksize(); } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index dae2cf097bc..f157e75e385 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -140,7 +140,7 @@ int dram_init(void) #endif mmdc_init(&mparam); -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 7d56eb0117d..b21c4d917d0 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -88,7 +88,7 @@ int dram_init(void) mmdc_init(&mparam); gd->ram_size = CFG_SYS_SDRAM_SIZE; -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 5f0564f1b23..ab69eab8408 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -138,7 +138,7 @@ int dram_init(void) #endif gd->ram_size = CFG_SYS_SDRAM_SIZE; -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index 2fdac87bc29..4eff0a3fee0 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -99,7 +99,7 @@ void ddrmc_init(void) int dram_init(void) { -#if (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) +#if (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)) ddrmc_init(); #endif @@ -125,7 +125,7 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void board_init_f(ulong dummy) { /* Clear the BSS */ diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c index 5b0f23688f0..fd897e832c8 100644 --- a/board/freescale/ls1021aqds/ddr.c +++ b/board/freescale/ls1021aqds/ddr.c @@ -172,14 +172,14 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_SPL) puts("Initializing DDR....using SPD\n"); dram_size = fsl_ddr_sdram(); #else dram_size = fsl_ddr_sdram_size(); #endif -#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD) fsl_dp_resume(); #endif diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 930ef6be385..0bdd468d9a7 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -181,7 +181,7 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void board_init_f(ulong dummy) { #ifdef CONFIG_NAND_BOOT diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index b7e043b2e62..d1acccec110 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; static void ddrmc_init(void) { -#if (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) +#if (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)) struct ccsr_ddr *ddr = (struct ccsr_ddr *)CFG_SYS_FSL_DDR_ADDR; u32 temp_sdram_cfg, tmp; @@ -105,7 +105,7 @@ static void ddrmc_init(void) out_be32(&ddr->sdram_cfg_2, temp_sdram_cfg); } #endif -#endif /* !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) */ +#endif /* !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD) */ } int dram_init(void) @@ -116,7 +116,7 @@ int dram_init(void) gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); -#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD) fsl_dp_resume(); #endif @@ -156,7 +156,7 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void board_init_f(ulong dummy) { void (*second_uboot)(void); @@ -214,7 +214,7 @@ int board_init(void) return 0; } -#if defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_XPL_BUILD) void spl_board_init(void) { ls102xa_smmu_stream_id_init(); diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 78006afce86..cc9665c0410 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -224,7 +224,7 @@ void ddrmc_init(void) int dram_init(void) { -#if (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) +#if (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)) ddrmc_init(); #endif @@ -232,7 +232,7 @@ int dram_init(void) gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); -#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD) fsl_dp_resume(); #endif @@ -407,7 +407,7 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void board_init_f(ulong dummy) { void (*second_uboot)(void); @@ -527,7 +527,7 @@ int board_init(void) return 0; } -#if defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_XPL_BUILD) void spl_board_init(void) { if (IS_ENABLED(CONFIG_FSL_CAAM)) { @@ -607,7 +607,7 @@ u16 flash_read16(void *addr) } #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) \ - && !defined(CONFIG_SPL_BUILD) + && !defined(CONFIG_XPL_BUILD) static void convert_flash_bank(char bank) { struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE); diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index e01b5a8c2eb..db94d9c1fa8 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -123,7 +123,7 @@ int board_early_init_f(void) u8 uart; #endif -#if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_XPL_BUILD) i2c_early_init_f(); #endif diff --git a/board/freescale/ls1043aqds/Makefile b/board/freescale/ls1043aqds/Makefile index 49d8d7d9b96..ff830788fd7 100644 --- a/board/freescale/ls1043aqds/Makefile +++ b/board/freescale/ls1043aqds/Makefile @@ -5,7 +5,7 @@ # obj-y += ddr.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-y += eth.o endif obj-y += ls1043aqds.o diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c index 2a9717df616..137ad7395ad 100644 --- a/board/freescale/ls1043aqds/ddr.c +++ b/board/freescale/ls1043aqds/ddr.c @@ -123,7 +123,7 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 2ecf5a74a03..f043599fbb8 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -288,7 +288,7 @@ int dram_init(void) select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); fsl_initdram(); #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ - defined(CONFIG_SPL_BUILD) + defined(CONFIG_XPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1043ardb/Makefile b/board/freescale/ls1043ardb/Makefile index 5309576c688..95745bf3a9c 100644 --- a/board/freescale/ls1043ardb/Makefile +++ b/board/freescale/ls1043ardb/Makefile @@ -4,7 +4,7 @@ obj-y += ddr.o obj-y += ls1043ardb.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-$(CONFIG_NET) += eth.o obj-y += cpld.o endif diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 187925e981a..231b60d1b3d 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -225,14 +225,14 @@ int fsl_initdram(void) phys_size_t dram_size; #ifdef CONFIG_SYS_DDR_RAW_TIMING -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_SPL) puts("Initializing DDR....\n"); dram_size = fsl_ddr_sdram(); #else dram_size = fsl_ddr_sdram_size(); #endif #else -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_SPL) puts("Initialzing DDR using fixed setting\n"); dram_size = fixed_sdram(); #else diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index cf84ff9e638..bba041065b5 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -132,7 +132,7 @@ int board_early_init_f(void) return 0; } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD int checkboard(void) { diff --git a/board/freescale/ls1046aqds/Makefile b/board/freescale/ls1046aqds/Makefile index 6267522cc26..365247d92bc 100644 --- a/board/freescale/ls1046aqds/Makefile +++ b/board/freescale/ls1046aqds/Makefile @@ -5,7 +5,7 @@ # obj-y += ddr.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-y += eth.o endif obj-y += ls1046aqds.o diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c index ac1b6049721..57790335f0a 100644 --- a/board/freescale/ls1046aqds/ddr.c +++ b/board/freescale/ls1046aqds/ddr.c @@ -107,7 +107,7 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index a83b2170651..7df12550868 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -284,7 +284,7 @@ int dram_init(void) select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); fsl_initdram(); #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ - defined(CONFIG_SPL_BUILD) + defined(CONFIG_XPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1046ardb/Makefile b/board/freescale/ls1046ardb/Makefile index 1c13ed6b6f0..9e5d24f53c8 100644 --- a/board/freescale/ls1046ardb/Makefile +++ b/board/freescale/ls1046ardb/Makefile @@ -4,7 +4,7 @@ obj-y += ddr.o obj-y += ls1046ardb.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-$(CONFIG_NET) += eth.o obj-y += cpld.o endif diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c index 68353022e7d..4170666c420 100644 --- a/board/freescale/ls1046ardb/ddr.c +++ b/board/freescale/ls1046ardb/ddr.c @@ -113,7 +113,7 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 0492f0a8c0a..83b280f7646 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -44,7 +44,7 @@ int board_early_init_f(void) return 0; } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD int checkboard(void) { static const char *freq[2] = {"100.00MHZ", "156.25MHZ"}; diff --git a/board/freescale/ls1088a/Makefile b/board/freescale/ls1088a/Makefile index c2b0e7dc0f4..e54d6cad9e1 100644 --- a/board/freescale/ls1088a/Makefile +++ b/board/freescale/ls1088a/Makefile @@ -4,7 +4,7 @@ obj-y += ls1088a.o obj-y += ddr.o -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o endif diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c index 54b432ad794..cd590af9534 100644 --- a/board/freescale/ls1088a/ddr.c +++ b/board/freescale/ls1088a/ddr.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)) static void fsl_ddr_setup_0v9_volt(memctl_options_t *popts) { int vdd; @@ -101,7 +101,7 @@ found: popts->addr_hash = 1; popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_60ohm); -#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_VID) && (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)) fsl_ddr_setup_0v9_volt(popts); #endif @@ -124,7 +124,7 @@ int fsl_initdram(void) { puts("Initializing DDR....using SPD\n"); -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); #else gd->ram_size = fsl_ddr_sdram(); diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 58951f2bb2a..9f4eb4811d9 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -248,7 +248,7 @@ int fixup_ls1088ardb_pb_banner(void *fdt) return 0; } -#if !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_XPL_BUILD) int checkboard(void) { #ifdef CONFIG_TFABOOT @@ -421,7 +421,7 @@ unsigned long get_board_ddr_clk(void) } #endif -#if !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_XPL_BUILD) void board_retimer_init(void) { u8 reg; @@ -804,7 +804,7 @@ exit: return ret; } -#if !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_XPL_BUILD) int board_init(void) { init_final_memctl_regs(); @@ -995,7 +995,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } #endif -#endif /* defined(CONFIG_SPL_BUILD) */ +#endif /* defined(CONFIG_XPL_BUILD) */ #ifdef CONFIG_TFABOOT #ifdef CONFIG_MTD_NOR_FLASH diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c index d19c061e122..31ed72c949b 100644 --- a/board/freescale/ls2080aqds/ddr.c +++ b/board/freescale/ls2080aqds/ddr.c @@ -168,7 +168,7 @@ int fsl_initdram(void) #else int fsl_initdram(void) { -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); #else puts("Initializing DDR....using SPD\n"); diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 4c8d0706688..aba0560181a 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -264,7 +264,7 @@ void detail_board_ddr_info(void) #endif } -#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_XPL_BUILD) void fdt_fixup_board_enet(void *fdt) { int offset; @@ -323,7 +323,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fsl_fdt_fixup_dr_usb(blob, bd); -#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_XPL_BUILD) fdt_fixup_board_enet(blob); fdt_reserve_mc_mem(blob, 0x300); #endif diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c index a1a97f9f8c2..e56667c846f 100644 --- a/board/freescale/ls2080ardb/ddr.c +++ b/board/freescale/ls2080ardb/ddr.c @@ -173,7 +173,7 @@ int fsl_initdram(void) #else int fsl_initdram(void) { -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); #else puts("Initializing DDR....using SPD\n"); diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c index 7fc4fecf774..7d5beb32417 100644 --- a/board/freescale/ls2080ardb/eth_ls2080rdb.c +++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c @@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_eth_init(struct bd_info *bis) { -#if defined(CONFIG_PHY_AQUANTIA) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_PHY_AQUANTIA) && !defined(CONFIG_XPL_BUILD) /* * Export functions to be used by AQ firmware * upload application diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 3aa984dab8e..341f82ce724 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -58,7 +58,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_early_init_f(void) { -#if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_XPL_BUILD) i2c_early_init_f(); #endif diff --git a/board/freescale/mx23evk/Makefile b/board/freescale/mx23evk/Makefile index 6fe6992a5fc..5cc99ab1836 100644 --- a/board/freescale/mx23evk/Makefile +++ b/board/freescale/mx23evk/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-y := mx23evk.o else obj-y := spl_boot.o diff --git a/board/freescale/mx28evk/Makefile b/board/freescale/mx28evk/Makefile index 057760433da..1fd2a439f7a 100644 --- a/board/freescale/mx28evk/Makefile +++ b/board/freescale/mx28evk/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD obj-y := mx28evk.o else obj-y := iomux.o diff --git a/board/freescale/mx6memcal/Makefile b/board/freescale/mx6memcal/Makefile index fc2d3eb9e10..b4088b9f2ec 100644 --- a/board/freescale/mx6memcal/Makefile +++ b/board/freescale/mx6memcal/Makefile @@ -4,7 +4,7 @@ # # (C) Copyright 2011 Freescale Semiconductor, Inc. -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y := spl.o else obj-y := mx6memcal.o diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index bab62fd4421..8ca57e0b2ac 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -545,7 +545,7 @@ int board_ehci_hcd_init(int port) } #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #include <asm/arch/mx6-ddr.h> #include <spl.h> #include <linux/libfdt.h> diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index bb066a5d36c..dff3a9c33bf 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -507,7 +507,7 @@ int board_late_init(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #include <asm/arch/mx6-ddr.h> #include <spl.h> #include <linux/libfdt.h> diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index d37d8a4136f..fb145fa6aac 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -61,7 +61,7 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_UART1_RXD__UART1_RXD | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD static iomux_v3_cfg_t const usdhc1_pads[] = { /* 8 bit SD */ MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -195,7 +195,7 @@ int checkboard(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #include <spl.h> #include <linux/libfdt.h> diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index e5a0197e2fd..c4ab59da78c 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -123,7 +123,7 @@ static int board_qspi_init(void) } #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ @@ -346,7 +346,7 @@ void board_preboot_os(void) gpio_set_value(IMX_GPIO_NR(5, 9), 0); } -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD #include <linux/libfdt.h> #include <spl.h> #include <asm/arch/mx6-ddr.h> diff --git a/board/freescale/p1010rdb/Makefile b/board/freescale/p1010rdb/Makefile index a00806e6aae..df4e8001d38 100644 --- a/board/freescale/p1010rdb/Makefile +++ b/board/freescale/p1010rdb/Makefile @@ -4,7 +4,7 @@ MINIMAL= -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD ifndef CONFIG_TPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y @@ -15,7 +15,7 @@ endif ifdef MINIMAL obj-y += spl_minimal.o else -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o endif obj-y += p1010rdb.o diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index e386840d9ef..9b4b6f34f46 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -656,7 +656,7 @@ int misc_init_r(void) return 0; } -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD static int pin_mux_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c index 44acebaa2bb..aa130ccf78b 100644 --- a/board/freescale/p1010rdb/tlb.c +++ b/board/freescale/p1010rdb/tlb.c @@ -41,7 +41,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 1, BOOKE_PAGESZ_1M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS, MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_16M, 1), diff --git a/board/freescale/p1_p2_rdb_pc/Makefile b/board/freescale/p1_p2_rdb_pc/Makefile index cbdb2507e83..8c13813e3b0 100644 --- a/board/freescale/p1_p2_rdb_pc/Makefile +++ b/board/freescale/p1_p2_rdb_pc/Makefile @@ -4,7 +4,7 @@ MINIMAL= -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD ifndef CONFIG_TPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y @@ -15,7 +15,7 @@ endif ifdef MINIMAL obj-y += spl_minimal.o else -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o endif obj-y += p1_p2_rdb_pc.o diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index ae0b7adbe54..f27821418eb 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -37,7 +37,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 1, BOOKE_PAGESZ_1M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* W**G* - Flash/promjet, localbus */ /* This will be changed to *I*G* after relocation to RAM. */ SET_TLB_ENTRY(1, CFG_SYS_FLASH_BASE, CFG_SYS_FLASH_BASE_PHYS, diff --git a/board/freescale/t102xrdb/Makefile b/board/freescale/t102xrdb/Makefile index e597486c940..b0f27c47191 100644 --- a/board/freescale/t102xrdb/Makefile +++ b/board/freescale/t102xrdb/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o else obj-y += t102xrdb.o diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c index f8d504fb3c7..1a8a131cdcc 100644 --- a/board/freescale/t102xrdb/ddr.c +++ b/board/freescale/t102xrdb/ddr.c @@ -236,7 +236,7 @@ int dram_init(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) #ifndef CONFIG_SYS_DDR_RAW_TIMING puts("Initializing....using SPD\n"); #endif @@ -248,7 +248,7 @@ int dram_init(void) dram_size = setup_ddr_tlbs(dram_size / 0x100000); dram_size *= 0x100000; -#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD) fsl_dp_resume(); #endif diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c index 008bd6e72b7..8e99c2c7022 100644 --- a/board/freescale/t102xrdb/tlb.c +++ b/board/freescale/t102xrdb/tlb.c @@ -53,7 +53,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* *I*G* - PCI */ SET_TLB_ENTRY(1, CFG_SYS_PCIE1_MEM_VIRT, CFG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -100,7 +100,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 11, BOOKE_PAGESZ_256K, 1), #endif -#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_XPL_BUILD) SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, 0, 12, BOOKE_PAGESZ_1G, 1), diff --git a/board/freescale/t104xrdb/Makefile b/board/freescale/t104xrdb/Makefile index a9495019430..9bca1a1fbcc 100644 --- a/board/freescale/t104xrdb/Makefile +++ b/board/freescale/t104xrdb/Makefile @@ -2,7 +2,7 @@ # # Copyright 2013 Freescale Semiconductor, Inc. -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o else obj-y += t104xrdb.o diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c index bab684860da..6c066480b46 100644 --- a/board/freescale/t104xrdb/ddr.c +++ b/board/freescale/t104xrdb/ddr.c @@ -129,7 +129,7 @@ int dram_init(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) puts("Initializing....using SPD\n"); dram_size = fsl_ddr_sdram(); #else @@ -138,7 +138,7 @@ int dram_init(void) dram_size = setup_ddr_tlbs(dram_size / 0x100000); dram_size *= 0x100000; -#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD) fsl_dp_resume(); #endif diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c index 24bc83f756b..7b2183da8b0 100644 --- a/board/freescale/t104xrdb/tlb.c +++ b/board/freescale/t104xrdb/tlb.c @@ -38,7 +38,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 0, BOOKE_PAGESZ_256K, 1), -#elif defined(CONFIG_NXP_ESBC) && defined(CONFIG_SPL_BUILD) +#elif defined(CONFIG_NXP_ESBC) && defined(CONFIG_XPL_BUILD) /* * *I*G - L3SRAM. When L3 is used as 256K SRAM, in case of Secure Boot * the physical address of the SRAM is at 0xbffc0000, @@ -66,7 +66,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* *I*G* - PCI */ SET_TLB_ENTRY(1, CFG_SYS_PCIE1_MEM_VIRT, CFG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -118,7 +118,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 11, BOOKE_PAGESZ_256K, 1), #endif -#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_XPL_BUILD) SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, 0, 12, BOOKE_PAGESZ_1G, 1), diff --git a/board/freescale/t208xqds/Makefile b/board/freescale/t208xqds/Makefile index de8613058de..eb99d921b4a 100644 --- a/board/freescale/t208xqds/Makefile +++ b/board/freescale/t208xqds/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o else obj-$(CONFIG_TARGET_T2080QDS) += t208xqds.o eth_t208xqds.o diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c index 9076fbba10a..77c8ce0c870 100644 --- a/board/freescale/t208xqds/ddr.c +++ b/board/freescale/t208xqds/ddr.c @@ -109,7 +109,7 @@ int dram_init(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) puts("Initializing....using SPD\n"); dram_size = fsl_ddr_sdram(); #else diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c index a4cc532acda..08c140afc68 100644 --- a/board/freescale/t208xqds/tlb.c +++ b/board/freescale/t208xqds/tlb.c @@ -65,7 +65,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* *I*G* - PCIe 1, 0x80000000 */ SET_TLB_ENTRY(1, CFG_SYS_PCIE1_MEM_VIRT, CFG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -142,7 +142,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 18, BOOKE_PAGESZ_1M, 1), #endif -#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_XPL_BUILD) SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, 0, 19, BOOKE_PAGESZ_2G, 1) diff --git a/board/freescale/t208xrdb/Makefile b/board/freescale/t208xrdb/Makefile index 7af3cd0ac4c..e5ef250c8b2 100644 --- a/board/freescale/t208xrdb/Makefile +++ b/board/freescale/t208xrdb/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o else obj-$(CONFIG_TARGET_T2080RDB) += t208xrdb.o eth_t208xrdb.o cpld.o diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c index fe98f62668a..cc9586eaa14 100644 --- a/board/freescale/t208xrdb/ddr.c +++ b/board/freescale/t208xrdb/ddr.c @@ -102,7 +102,7 @@ int dram_init(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) puts("Initializing....using SPD\n"); dram_size = fsl_ddr_sdram(); #else diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c index a9a03908dfb..a3f283548f3 100644 --- a/board/freescale/t208xrdb/tlb.c +++ b/board/freescale/t208xrdb/tlb.c @@ -65,7 +65,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* *I*G* - PCIe 1, 0x80000000 */ SET_TLB_ENTRY(1, CFG_SYS_PCIE1_MEM_VIRT, CFG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -141,7 +141,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G, 0, 18, BOOKE_PAGESZ_1M, 1), #endif -#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_XPL_BUILD) SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, 0, 19, BOOKE_PAGESZ_2G, 1) diff --git a/board/freescale/t4rdb/Makefile b/board/freescale/t4rdb/Makefile index 3106848639c..8d94faaba1c 100644 --- a/board/freescale/t4rdb/Makefile +++ b/board/freescale/t4rdb/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_SPL_BUILD +ifdef CONFIG_XPL_BUILD obj-y += spl.o else obj-$(CONFIG_TARGET_T4240RDB) += t4240rdb.o diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c index cd14d5895f5..f076350c1c5 100644 --- a/board/freescale/t4rdb/cpld.c +++ b/board/freescale/t4rdb/cpld.c @@ -94,7 +94,7 @@ static void cpld_dump_regs(void) } #endif -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD int do_cpld(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int rc = 0; diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c index bbe31d4a54e..1ce70962264 100644 --- a/board/freescale/t4rdb/ddr.c +++ b/board/freescale/t4rdb/ddr.c @@ -111,7 +111,7 @@ int dram_init(void) puts("Initializing....using SPD\n"); -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) +#if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) dram_size = fsl_ddr_sdram(); #else /* DDR has been initialised by first stage boot loader */ diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c index 1fb9d41d52b..7c58c14f3b6 100644 --- a/board/freescale/t4rdb/tlb.c +++ b/board/freescale/t4rdb/tlb.c @@ -51,7 +51,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), -#ifndef CONFIG_SPL_BUILD +#ifndef CONFIG_XPL_BUILD /* *I*G* - PCI */ SET_TLB_ENTRY(1, CFG_SYS_PCIE1_MEM_VIRT, CFG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -114,7 +114,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SW|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 17, BOOKE_PAGESZ_4K, 1), #endif -#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_XPL_BUILD) SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M, 0, 18, BOOKE_PAGESZ_2G, 1) |