board: Use CONFIG_XPL_BUILD instead of CONFIG_SPL_BUILD

Use the new symbol to refer to any 'SPL' build, including TPL and VPL

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-09-29 19:49:47 -06:00 committed by Tom Rini
parent bef9fdbed2
commit dac3ce976a
305 changed files with 456 additions and 456 deletions

View file

@ -5,7 +5,7 @@
# Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> # Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at>
# Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com # Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
ifeq ($(CONFIG_SPL_BUILD),y) ifeq ($(CONFIG_XPL_BUILD),y)
obj-y := mux.o obj-y := mux.o
endif endif
obj-y += ../common/common.o obj-y += ../common/common.o

View file

@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* -- defines for GPIO -- */ /* -- defines for GPIO -- */
#define REPSWITCH (0+20) /* GPIO0_20 */ #define REPSWITCH (0+20) /* GPIO0_20 */
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
/* TODO: check ram-timing ! */ /* TODO: check ram-timing ! */
static const struct ddr_data ddr3_data = { static const struct ddr_data ddr3_data = {
.datardsratio0 = MT41K256M16HA125E_RD_DQS, .datardsratio0 = MT41K256M16HA125E_RD_DQS,
@ -142,7 +142,7 @@ void sdram_init(void)
&ddr3_cmd_ctrl_data, &ddr3_cmd_ctrl_data,
&ddr3_emif_reg_data, 0); &ddr3_emif_reg_data, 0);
} }
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
/* Basic board specific setup. Pinmux has been handled already. */ /* Basic board specific setup. Pinmux has been handled already. */
int board_init(void) int board_init(void)

View file

@ -16,7 +16,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-pins.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
# include <asm/arch/mx6-ddr.h> # include <asm/arch/mx6-ddr.h>
#endif #endif
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
@ -82,7 +82,7 @@
#define MUXDESC(pad, ctrl) IOMUX_PADS(pad | MUX_PAD_CTRL(ctrl)) #define MUXDESC(pad, ctrl) IOMUX_PADS(pad | MUX_PAD_CTRL(ctrl))
#if !defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_XPL_BUILD)
static iomux_v3_cfg_t const eth_pads[] = { static iomux_v3_cfg_t const eth_pads[] = {
/* /*
* Gigabit Ethernet * Gigabit Ethernet
@ -542,4 +542,4 @@ void board_init_f(ulong dummy)
void reset_cpu(void) void reset_cpu(void)
{ {
} }
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */

View file

@ -23,7 +23,7 @@ cmd_prodzip = \
zip -9 -r $@ misc/* >/dev/null $< zip -9 -r $@ misc/* >/dev/null $<
ifeq ($(hw-platform-y),brppt2) ifeq ($(hw-platform-y),brppt2)
ifneq ($(CONFIG_SPL_BUILD),y) ifneq ($(CONFIG_XPL_BUILD),y)
INPUTS-y += $(hw-platform-y)_prog.bin INPUTS-y += $(hw-platform-y)_prog.bin
INPUTS-y += $(hw-platform-y)_prod.zip INPUTS-y += $(hw-platform-y)_prod.zip
endif endif

View file

@ -4,7 +4,7 @@
# B&R Industrial Automation GmbH - http://www.br-automation.com/ # B&R Industrial Automation GmbH - http://www.br-automation.com/
# #
obj-$(CONFIG_SPL_BUILD) += mux.o obj-$(CONFIG_XPL_BUILD) += mux.o
obj-y += ../common/br_resetc.o obj-y += ../common/br_resetc.o
obj-y += ../common/common.o obj-y += ../common/common.o
obj-y += board.o obj-y += board.o

View file

@ -32,7 +32,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
static const struct ddr_data ddr3_data = { static const struct ddr_data ddr3_data = {
.datardsratio0 = MT41K256M16HA125E_RD_DQS, .datardsratio0 = MT41K256M16HA125E_RD_DQS,
.datawdsratio0 = MT41K256M16HA125E_WR_DQS, .datawdsratio0 = MT41K256M16HA125E_WR_DQS,
@ -124,8 +124,8 @@ void sdram_init(void)
&ddr3_cmd_ctrl_data, &ddr3_cmd_ctrl_data,
&ddr3_emif_reg_data, 0); &ddr3_emif_reg_data, 0);
} }
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#if !defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_XPL_BUILD)
/* decision if backlight is switched on or not on powerup */ /* decision if backlight is switched on or not on powerup */
int board_backlightstate(void) int board_backlightstate(void)
@ -166,4 +166,4 @@ int board_late_init(void)
} }
#endif /* CONFIG_BOARD_LATE_INIT */ #endif /* CONFIG_BOARD_LATE_INIT */
#endif /* !CONFIG_SPL_BUILD */ #endif /* !CONFIG_XPL_BUILD */

View file

@ -5,7 +5,7 @@
# Copyright (C) 2014 Hannes Schmelzer <oe5hpm@oevsv.at> - # Copyright (C) 2014 Hannes Schmelzer <oe5hpm@oevsv.at> -
# Bernecker & Rainer Industrielektronik GmbH - http://www.br-automation.com/ # Bernecker & Rainer Industrielektronik GmbH - http://www.br-automation.com/
obj-$(CONFIG_SPL_BUILD) += mux.o obj-$(CONFIG_XPL_BUILD) += mux.o
obj-y += ../common/br_resetc.o obj-y += ../common/br_resetc.o
obj-y += ../common/common.o obj-y += ../common/common.o
obj-y += board.o obj-y += board.o

View file

@ -39,7 +39,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
static const struct ddr_data ddr3_data = { static const struct ddr_data ddr3_data = {
.datardsratio0 = MT41K256M16HA125E_RD_DQS, .datardsratio0 = MT41K256M16HA125E_RD_DQS,
.datawdsratio0 = MT41K256M16HA125E_WR_DQS, .datawdsratio0 = MT41K256M16HA125E_WR_DQS,
@ -134,7 +134,7 @@ void sdram_init(void)
&ddr3_cmd_ctrl_data, &ddr3_cmd_ctrl_data,
&ddr3_emif_reg_data, 0); &ddr3_emif_reg_data, 0);
} }
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
/* /*
* Basic board specific setup. Pinmux has been handled already. * Basic board specific setup. Pinmux has been handled already.
*/ */

View file

@ -83,7 +83,7 @@ int overwrite_console(void)
return 1; return 1;
} }
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_AM33XX) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_AM33XX)
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/omap.h> #include <asm/arch/omap.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
@ -175,4 +175,4 @@ void set_mux_conf_regs(void)
enable_board_pin_mux(); enable_board_pin_mux();
} }
#endif /* CONFIG_SPL_BUILD && CONFIG_AM33XX */ #endif /* CONFIG_XPL_BUILD && CONFIG_AM33XX */

View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# (C) 2022 Pali Rohár <pali@kernel.org> # (C) 2022 Pali Rohár <pali@kernel.org>
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += ../../freescale/p1_p2_rdb_pc/spl.o obj-y += ../../freescale/p1_p2_rdb_pc/spl.o
endif endif

View file

@ -111,7 +111,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
0, 9, BOOKE_PAGESZ_256K, 1), 0, 9, BOOKE_PAGESZ_256K, 1),
#endif #endif
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL) && !defined(CONFIG_XPL_BUILD)
/* **M** - SDRAM 2G */ /* **M** - SDRAM 2G */
SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE, SET_TLB_ENTRY(1, CFG_SYS_DDR_SDRAM_BASE,
CFG_SYS_DDR_SDRAM_BASE, CFG_SYS_DDR_SDRAM_BASE,

View file

@ -4,4 +4,4 @@
obj-y := turris_omnia.o ../turris_atsha_otp.o ../turris_common.o obj-y := turris_omnia.o ../turris_atsha_otp.o ../turris_common.o
obj-$(CONFIG_CMD_EEPROM_LAYOUT) += eeprom.o obj-$(CONFIG_CMD_EEPROM_LAYOUT) += eeprom.o
obj-$(CONFIG_SPL_BUILD) += old_ddr3_training.o obj-$(CONFIG_XPL_BUILD) += old_ddr3_training.o

View file

@ -494,7 +494,7 @@ static bool omnia_read_eeprom(struct omnia_eeprom *oep)
if (!eeprom) if (!eeprom)
return false; return false;
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_XPL_BUILD))
ret = dm_i2c_read(eeprom, 0, (void *)oep, sizeof(*oep)); ret = dm_i2c_read(eeprom, 0, (void *)oep, sizeof(*oep));
else else
ret = i2c_eeprom_read(eeprom, 0, (void *)oep, sizeof(*oep)); ret = i2c_eeprom_read(eeprom, 0, (void *)oep, sizeof(*oep));

View file

@ -3,6 +3,6 @@
# Copyright (C) 2015 Phil Sutter <phil@nwl.cc> # Copyright (C) 2015 Phil Sutter <phil@nwl.cc>
obj-y += ds414.o obj-y += ds414.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-y += cmd_syno.o obj-y += cmd_syno.o
endif endif

View file

@ -8,7 +8,7 @@
ifdef CONFIG_TARGET_IMX8MP_RSB3720A1_6G ifdef CONFIG_TARGET_IMX8MP_RSB3720A1_6G
obj-y += imx8mp_rsb3720a1.o obj-y += imx8mp_rsb3720a1.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_rsb3720a1_6G.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_rsb3720a1_6G.o
endif endif
@ -17,7 +17,7 @@ endif
ifdef CONFIG_TARGET_IMX8MP_RSB3720A1_4G ifdef CONFIG_TARGET_IMX8MP_RSB3720A1_4G
obj-y += imx8mp_rsb3720a1.o obj-y += imx8mp_rsb3720a1.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_rsb3720a1_4G.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_rsb3720a1_4G.o
endif endif

View file

@ -5,4 +5,4 @@
# #
obj-y += imx8qm_dmsse20_a1.o obj-y += imx8qm_dmsse20_a1.o
obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_XPL_BUILD) += spl.o

View file

@ -6,6 +6,6 @@
obj-y += imx8qm_rom7720_a1.o obj-y += imx8qm_rom7720_a1.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
endif endif

View file

@ -4,6 +4,6 @@
# #
obj-y := $(BOARD).o obj-y := $(BOARD).o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-y += ../common/gpio_hog.o obj-y += ../common/gpio_hog.o
endif endif

View file

@ -6,7 +6,7 @@
# (C) Copyright 2021 # (C) Copyright 2021
# Svyatoslav Ryhel <clamor95@gmail.com> # Svyatoslav Ryhel <clamor95@gmail.com>
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-$(CONFIG_DM_PMIC_MAX77663) += grouper-spl-max.o obj-$(CONFIG_DM_PMIC_MAX77663) += grouper-spl-max.o
obj-$(CONFIG_DM_PMIC_TPS65910) += grouper-spl-ti.o obj-$(CONFIG_DM_PMIC_TPS65910) += grouper-spl-ti.o
endif endif

View file

@ -6,6 +6,6 @@
# (C) Copyright 2021 # (C) Copyright 2021
# Svyatoslav Ryhel <clamor95@gmail.com> # Svyatoslav Ryhel <clamor95@gmail.com>
obj-$(CONFIG_SPL_BUILD) += transformer-t30-spl.o obj-$(CONFIG_XPL_BUILD) += transformer-t30-spl.o
obj-y += transformer-t30.o obj-y += transformer-t30.o

View file

@ -70,7 +70,7 @@ void at91sam9m10g45ek_nand_hw_init(void)
} }
#endif #endif
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#include <spl.h> #include <spl.h>
#include <nand.h> #include <nand.h>

View file

@ -119,7 +119,7 @@ int dram_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#include <spl.h> #include <spl.h>
#include <nand.h> #include <nand.h>

View file

@ -134,7 +134,7 @@ int dram_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#include <spl.h> #include <spl.h>
#include <nand.h> #include <nand.h>

View file

@ -105,7 +105,7 @@ int misc_init_r(void)
#endif #endif
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
} }

View file

@ -90,7 +90,7 @@ int dram_init(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
static void board_leds_init(void) static void board_leds_init(void)
{ {

View file

@ -79,7 +79,7 @@ int misc_init_r(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* must set PB25 low to enable the CAN transceivers */ /* must set PB25 low to enable the CAN transceivers */
static void board_can_stdby_dis(void) static void board_can_stdby_dis(void)

View file

@ -105,7 +105,7 @@ int misc_init_r(void)
#endif #endif
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
} }

View file

@ -117,7 +117,7 @@ int dram_init(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
#ifdef CONFIG_SD_BOOT #ifdef CONFIG_SD_BOOT

View file

@ -194,7 +194,7 @@ int board_late_init(void)
#endif #endif
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
#if CONFIG_NAND_BOOT #if CONFIG_NAND_BOOT

View file

@ -141,7 +141,7 @@ int dram_init(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
#if CONFIG_NAND_BOOT #if CONFIG_NAND_BOOT

View file

@ -127,7 +127,7 @@ int dram_init(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
#if CONFIG_NAND_BOOT #if CONFIG_NAND_BOOT

View file

@ -3,6 +3,6 @@
# (C) Copyright 2013 # (C) Copyright 2013
# Avionic Design GmbH <www.avionic-design.de> # Avionic Design GmbH <www.avionic-design.de>
obj-$(CONFIG_SPL_BUILD) += tec-ng-spl.o obj-$(CONFIG_XPL_BUILD) += tec-ng-spl.o
obj-y += ../common/tamonten-ng.o obj-y += ../common/tamonten-ng.o

View file

@ -7,7 +7,7 @@
obj-y += imx8mm_beacon.o obj-y += imx8mm_beacon.o
obj-y += ../../freescale/common/ obj-y += ../../freescale/common/
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-y += lpddr4_timing.o obj-y += lpddr4_timing.o
endif endif

View file

@ -6,7 +6,7 @@
obj-y += imx8mn_beacon.o obj-y += imx8mn_beacon.o
obj-y += ../../freescale/common/ obj-y += ../../freescale/common/
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
ifdef CONFIG_IMX8MN_BEACON_2GB_LPDDR ifdef CONFIG_IMX8MN_BEACON_2GB_LPDDR
obj-y += lpddr4_2g_timing.o obj-y += lpddr4_2g_timing.o

View file

@ -7,7 +7,7 @@
obj-y += imx8mp_beacon.o obj-y += imx8mp_beacon.o
obj-y += ../../freescale/common/ obj-y += ../../freescale/common/
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o
endif endif

View file

@ -6,4 +6,4 @@ obj-y += ../../xilinx/common/board.o
# Remove quotes # Remove quotes
hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
obj-$(CONFIG_SPL_BUILD) += $(hw-platform-y)/ps7_init_gpl.o obj-$(CONFIG_XPL_BUILD) += $(hw-platform-y)/ps7_init_gpl.o

View file

@ -269,7 +269,7 @@ int dram_init(void)
return 0; return 0;
} }
#if IS_ENABLED(CONFIG_SPL_BUILD) #if IS_ENABLED(CONFIG_XPL_BUILD)
#include <asm/arch/crm_regs.h> #include <asm/arch/crm_regs.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>

View file

@ -259,7 +259,7 @@ static void check_button_status(void)
} }
} }
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void) int spl_start_uboot(void)
{ {
@ -473,7 +473,7 @@ int board_late_init(void)
#endif #endif
#if defined(CONFIG_USB_ETHER) && \ #if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) (!defined(CONFIG_XPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
int board_eth_init(struct bd_info *bis) int board_eth_init(struct bd_info *bis)
{ {
return usb_eth_initialize(bis); return usb_eth_initialize(bis);

View file

@ -2,5 +2,5 @@
# (C) Copyright 2021 Amarula Solutions B.V. # (C) Copyright 2021 Amarula Solutions B.V.
obj-y := imx6ulz_smm_m2.o obj-y := imx6ulz_smm_m2.o
obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_XPL_BUILD) += spl.o

View file

@ -6,7 +6,7 @@
obj-y += imx8mn_smm_s2.o obj-y += imx8mn_smm_s2.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_BSH_SMM_S2_DDR3L_256) += ddr3l_timing_256m.o obj-$(CONFIG_BSH_SMM_S2_DDR3L_256) += ddr3l_timing_256m.o
obj-$(CONFIG_BSH_SMM_S2_DDR3L_512) += ddr3l_timing_512m.o obj-$(CONFIG_BSH_SMM_S2_DDR3L_512) += ddr3l_timing_512m.o

View file

@ -5,4 +5,4 @@
# #
obj-y := mamoj.o obj-y := mamoj.o
obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_XPL_BUILD) += spl.o

View file

@ -6,7 +6,7 @@
obj-y += imx8mm_phg.o obj-y += imx8mm_phg.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o
endif endif

View file

@ -10,7 +10,7 @@
obj-y := mux.o common.o obj-y := mux.o common.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
else else
obj-y += cl-som-imx7.o obj-y += cl-som-imx7.o

View file

@ -18,7 +18,7 @@ PADS_SET_PROT(uart1_pads);
PADS_SET_PROT(espi1_pads); PADS_SET_PROT(espi1_pads);
#endif /* CONFIG_SPI */ #endif /* CONFIG_SPI */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#ifdef CONFIG_FSL_ESDHC_IMX #ifdef CONFIG_FSL_ESDHC_IMX
PADS_SET_PROT(usdhc3_emmc_pads); PADS_SET_PROT(usdhc3_emmc_pads);
#endif /* CONFIG_FSL_ESDHC_IMX */ #endif /* CONFIG_FSL_ESDHC_IMX */
@ -28,4 +28,4 @@ PADS_SET_PROT(fec1_pads);
#endif /* CONFIG_FEC_MXC */ #endif /* CONFIG_FEC_MXC */
PADS_SET_PROT(usb_otg1_pads); PADS_SET_PROT(usb_otg1_pads);
PADS_SET_PROT(wdog_pads); PADS_SET_PROT(wdog_pads);
#endif /* !CONFIG_SPL_BUILD */ #endif /* !CONFIG_XPL_BUILD */

View file

@ -67,7 +67,7 @@ PADS_SET(espi1_pads)
#endif /* CONFIG_SPI */ #endif /* CONFIG_SPI */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#ifdef CONFIG_FSL_ESDHC_IMX #ifdef CONFIG_FSL_ESDHC_IMX
@ -138,4 +138,4 @@ static iomux_v3_cfg_t const wdog_pads[] = {
PADS_SET(wdog_pads) PADS_SET(wdog_pads)
#endif /* !CONFIG_SPL_BUILD */ #endif /* !CONFIG_XPL_BUILD */

View file

@ -3,7 +3,7 @@
# (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> # (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il>
# #
# Authors: Nikita Kiryanov <nikita@compulab.co.il> # Authors: Nikita Kiryanov <nikita@compulab.co.il>
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y = common.o spl.o obj-y = common.o spl.o
else else
obj-y = common.o cm_fx6.o obj-y = common.o cm_fx6.o

View file

@ -4,7 +4,7 @@
# #
# Copyright (C) 2015 Compulab, Ltd. # Copyright (C) 2015 Compulab, Ltd.
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o mux.o obj-y += spl.o mux.o
else else
obj-y += cm_t43.o mux.o obj-y += cm_t43.o mux.o

View file

@ -7,7 +7,7 @@
obj-y += imx8mm-cl-iot-gate.o obj-y += imx8mm-cl-iot-gate.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o eeprom_spl.o obj-y += spl.o eeprom_spl.o
obj-y += ddr/ obj-y += ddr/
endif endif

View file

@ -10,7 +10,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <linux/delay.h> #include <linux/delay.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_SYS_I2C_EEPROM_ADDR_P1 0x51 #define CFG_SYS_I2C_EEPROM_ADDR_P1 0x51

View file

@ -138,7 +138,7 @@ int board_late_init(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#include <spl.h> #include <spl.h>
#define MX6_PHYFLEX_ERR006282 IMX_GPIO_NR(2, 11) #define MX6_PHYFLEX_ERR006282 IMX_GPIO_NR(2, 11)

View file

@ -141,7 +141,7 @@ int dram_init(void)
} }
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_board_init(void) void spl_board_init(void)
{ {
} }

View file

@ -6,6 +6,6 @@
obj-y += cgtqmx8.o obj-y += cgtqmx8.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
endif endif

View file

@ -7,7 +7,7 @@
MINIMAL= MINIMAL=
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
ifndef CONFIG_TPL_BUILD ifndef CONFIG_TPL_BUILD
ifdef CONFIG_SPL_INIT_MINIMAL ifdef CONFIG_SPL_INIT_MINIMAL
MINIMAL=y MINIMAL=y

View file

@ -72,7 +72,7 @@ int board_phys_sdram_size(phys_size_t *size)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
static void data_modul_imx_edm_sbc_early_init_f(const iomux_v3_cfg_t wdog_pad) static void data_modul_imx_edm_sbc_early_init_f(const iomux_v3_cfg_t wdog_pad)
{ {
struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o lpddr4_timing_2G_32.o lpddr4_timing_4G_32.o obj-y += spl.o lpddr4_timing_2G_32.o lpddr4_timing_4G_32.o
else else
obj-y += imx8mm_data_modul_edm_sbc.o obj-y += imx8mm_data_modul_edm_sbc.o

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o lpddr4_timing_4G_32.o obj-y += spl.o lpddr4_timing_4G_32.o
else else
obj-y += imx8mp_data_modul_edm_sbc.o obj-y += imx8mp_data_modul_edm_sbc.o

View file

@ -311,7 +311,7 @@ int board_mmc_init(struct bd_info *bis)
#endif #endif
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
static const struct ns16550_plat serial_pdata = { static const struct ns16550_plat serial_pdata = {
.base = DAVINCI_UART2_BASE, .base = DAVINCI_UART2_BASE,
.reg_shift = 2, .reg_shift = 2,

View file

@ -2,7 +2,7 @@
# #
# Copyright (C) 2017 Marek Vasut <marex@denx.de> # Copyright (C) 2017 Marek Vasut <marex@denx.de>
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y := dh_imx6_spl.o obj-y := dh_imx6_spl.o
else else
obj-y := dh_imx6.o obj-y := dh_imx6.o

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o lpddr4_timing_2G_32.o lpddr4_timing_4G_32.o obj-y += spl.o lpddr4_timing_2G_32.o lpddr4_timing_4G_32.o
else else
obj-y += imx8mp_dhcom_pdk2.o obj-y += imx8mp_dhcom_pdk2.o

View file

@ -260,13 +260,13 @@ int board_stm32mp1_ddr_config_name_match(struct udevice *dev,
void board_vddcore_init(u32 voltage_mv) void board_vddcore_init(u32 voltage_mv)
{ {
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_XPL_BUILD))
opp_voltage_mv = voltage_mv; opp_voltage_mv = voltage_mv;
} }
int board_early_init_f(void) int board_early_init_f(void)
{ {
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_XPL_BUILD))
stpmic1_init(opp_voltage_mv); stpmic1_init(opp_voltage_mv);
board_get_coding_straps(); board_get_coding_straps();
@ -767,7 +767,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
} }
#endif #endif
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
void spl_perform_fixups(struct spl_image_info *spl_image) void spl_perform_fixups(struct spl_image_info *spl_image)
{ {
dh_stm32_ks8851_fixup(spl_image_fdt_addr(spl_image)); dh_stm32_ks8851_fixup(spl_image_fdt_addr(spl_image));

View file

@ -52,7 +52,7 @@ int board_init(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#include <spl.h> #include <spl.h>
#ifdef CONFIG_SPL_LOAD_FIT #ifdef CONFIG_SPL_LOAD_FIT

View file

@ -65,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CFG_SYS_RTC_SCRATCH0 0x60 #define CFG_SYS_RTC_SCRATCH0 0x60
#define BOOT_DEVICE_SAVE_REGISTER (RTC_BASE + CFG_SYS_RTC_SCRATCH0) #define BOOT_DEVICE_SAVE_REGISTER (RTC_BASE + CFG_SYS_RTC_SCRATCH0)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
static void save_boot_device(void) static void save_boot_device(void)
{ {
*((u32 *)(BOOT_DEVICE_SAVE_REGISTER)) = spl_boot_device(); *((u32 *)(BOOT_DEVICE_SAVE_REGISTER)) = spl_boot_device();

View file

@ -394,7 +394,7 @@ int checkboard(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#include <spl.h> #include <spl.h>
void board_init_f(ulong dummy) void board_init_f(ulong dummy)

View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# Copyright (C) 2016 Amarula Solutions B.V. # Copyright (C) 2016 Amarula Solutions B.V.
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-$(CONFIG_IMX6_ENGICAM_COMMON) += spl.o obj-$(CONFIG_IMX6_ENGICAM_COMMON) += spl.o
else else
obj-$(CONFIG_IMX6_ENGICAM_COMMON) += board.o obj-$(CONFIG_IMX6_ENGICAM_COMMON) += board.o

View file

@ -6,7 +6,7 @@
obj-y += icore_mx8mm.o obj-y += icore_mx8mm.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-y += lpddr4_timing.o obj-y += lpddr4_timing.o
endif endif

View file

@ -6,7 +6,7 @@
obj-y += icore_mx8mp.o obj-y += icore_mx8mp.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o
endif endif

View file

@ -3,7 +3,7 @@
# Copyright (C) 2018, STMicroelectronics - All Rights Reserved # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
# #
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
else else
obj-y += stm32mp1.o obj-y += stm32mp1.o

View file

@ -9,7 +9,7 @@
#include <asm/global_data.h> #include <asm/global_data.h>
#include <dm/ofnode.h> #include <dm/ofnode.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
static int setup_led(void) static int setup_led(void)
{ {
#ifdef CONFIG_SPL_LED #ifdef CONFIG_SPL_LED

View file

@ -13,7 +13,7 @@
#include <asm/arch-rockchip/gpio.h> #include <asm/arch-rockchip/gpio.h>
#include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define PMUGRF_BASE 0xff320000 #define PMUGRF_BASE 0xff320000
#define GPIO0_BASE 0xff720000 #define GPIO0_BASE 0xff720000

View file

@ -5,7 +5,7 @@
MINIMAL= MINIMAL=
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
ifndef CONFIG_TPL_BUILD ifndef CONFIG_TPL_BUILD
ifdef CONFIG_SPL_INIT_MINIMAL ifdef CONFIG_SPL_INIT_MINIMAL
MINIMAL=y MINIMAL=y
@ -29,14 +29,14 @@ endif
obj-$(CONFIG_FSL_CADMUS) += cadmus.o obj-$(CONFIG_FSL_CADMUS) += cadmus.o
obj-$(CONFIG_FSL_VIA) += cds_via.o obj-$(CONFIG_FSL_VIA) += cds_via.o
obj-$(CONFIG_FMAN_ENET) += fman.o obj-$(CONFIG_FMAN_ENET) += fman.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_FSL_NGPIXIS) += ngpixis.o obj-$(CONFIG_FSL_NGPIXIS) += ngpixis.o
endif endif
obj-$(I2C_COMMON) += i2c_common.o obj-$(I2C_COMMON) += i2c_common.o
obj-$(CONFIG_FSL_USE_PCA9547_MUX) += i2c_mux.o obj-$(CONFIG_FSL_USE_PCA9547_MUX) += i2c_mux.o
obj-$(CONFIG_$(SPL_)VID) += vid.o obj-$(CONFIG_$(SPL_)VID) += vid.o
obj-$(CONFIG_FSL_QIXIS) += qixis.o obj-$(CONFIG_FSL_QIXIS) += qixis.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o
endif endif
ifndef CONFIG_RAMBOOT_PBL ifndef CONFIG_RAMBOOT_PBL

View file

@ -23,7 +23,7 @@ loop:
return 0; return 0;
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
static int do_esbc_validate(struct cmd_tbl *cmdtp, int flag, int argc, static int do_esbc_validate(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
{ {

View file

@ -15,7 +15,7 @@
#include <dm/root.h> #include <dm/root.h>
#include <asm/fsl_secure_boot.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> #include <spl.h>
#endif #endif
@ -67,7 +67,7 @@ int fsl_check_boot_mode_secure(void)
return 0; return 0;
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
int fsl_setenv_chain_of_trust(void) int fsl_setenv_chain_of_trust(void)
{ {
/* Check Boot Mode /* Check Boot Mode
@ -92,7 +92,7 @@ int fsl_setenv_chain_of_trust(void)
} }
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr) void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr)
{ {
int res; int res;
@ -157,4 +157,4 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
image_entry(); image_entry();
} }
#endif /* ifdef CONFIG_SPL_FRAMEWORK */ #endif /* ifdef CONFIG_SPL_FRAMEWORK */
#endif /* ifdef CONFIG_SPL_BUILD */ #endif /* ifdef CONFIG_XPL_BUILD */

View file

@ -396,7 +396,7 @@ static void fsl_secboot_bootscript_parse_failure(void)
*/ */
void fsl_secboot_handle_error(int error) void fsl_secboot_handle_error(int error)
{ {
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
const struct fsl_secboot_errcode *e; const struct fsl_secboot_errcode *e;
for (e = fsl_secboot_errcodes; e->errcode != ERROR_ESBC_CLIENT_MAX; 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.num_bits = key_len * 8;
prop.exp_len = key_len; 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); ret = device_bind_driver(NULL, "fsl_rsa_mod_exp", "fsl_rsa_mod_exp", NULL);
if (ret) { if (ret) {
printf("Couldn't bind fsl_rsa_mod_exp driver (%d)\n", ret); printf("Couldn't bind fsl_rsa_mod_exp driver (%d)\n", ret);

View file

@ -161,7 +161,7 @@ void board_deassert_mem_reset(void)
} }
#endif #endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
static void qixis_reset(void) static void qixis_reset(void)
{ {
QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET); QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET);

View file

@ -6,7 +6,7 @@
obj-y += imx8mm_evk.o obj-y += imx8mm_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o
endif endif

View file

@ -6,7 +6,7 @@
obj-y += imx8mn_evk.o obj-y += imx8mn_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_ld.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing_ld.o

View file

@ -6,7 +6,7 @@
obj-y += imx8mp_evk.o obj-y += imx8mp_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o
endif endif

View file

@ -6,7 +6,7 @@
obj-y += imx8mq_evk.o obj-y += imx8mq_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o lpddr4_timing_b0.o obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o lpddr4_timing_b0.o
endif endif

View file

@ -5,4 +5,4 @@
# #
obj-y += imx8qm_mek.o obj-y += imx8qm_mek.o
obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_XPL_BUILD) += spl.o

View file

@ -5,4 +5,4 @@
# #
obj-y += imx8qxp_mek.o obj-y += imx8qxp_mek.o
obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_XPL_BUILD) += spl.o

View file

@ -2,7 +2,7 @@
obj-y += imx8ulp_evk.o obj-y += imx8ulp_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
ifdef CONFIG_IMX8ULP_ND_MODE ifdef CONFIG_IMX8ULP_ND_MODE
obj-y += lpddr4_timing_264.o obj-y += lpddr4_timing_264.o

View file

@ -6,7 +6,7 @@
obj-y += imx93_evk.o obj-y += imx93_evk.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_XPL_BUILD
obj-y += spl.o obj-y += spl.o
obj-$(CONFIG_IMX93_EVK_LPDDR4X) += lpddr4x_timing.o lpddr4x_timing_1866mts.o obj-$(CONFIG_IMX93_EVK_LPDDR4X) += lpddr4x_timing.o lpddr4x_timing_1866mts.o
endif endif

View file

@ -37,7 +37,7 @@ int dram_init_banksize(void)
return fdtdec_setup_memory_banksize(); return fdtdec_setup_memory_banksize();
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void) int spl_start_uboot(void)
{ {

View file

@ -37,7 +37,7 @@ int dram_init_banksize(void)
return fdtdec_setup_memory_banksize(); return fdtdec_setup_memory_banksize();
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void) int spl_start_uboot(void)
{ {

View file

@ -37,7 +37,7 @@ int dram_init_banksize(void)
return fdtdec_setup_memory_banksize(); return fdtdec_setup_memory_banksize();
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void) int spl_start_uboot(void)
{ {

View file

@ -140,7 +140,7 @@ int dram_init(void)
#endif #endif
mmdc_init(&mparam); 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 */ /* This will break-before-make MMU for DDR */
update_early_mmu_table(); update_early_mmu_table();
#endif #endif

View file

@ -88,7 +88,7 @@ int dram_init(void)
mmdc_init(&mparam); mmdc_init(&mparam);
gd->ram_size = CFG_SYS_SDRAM_SIZE; 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 */ /* This will break-before-make MMU for DDR */
update_early_mmu_table(); update_early_mmu_table();
#endif #endif

View file

@ -138,7 +138,7 @@ int dram_init(void)
#endif #endif
gd->ram_size = CFG_SYS_SDRAM_SIZE; 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 */ /* This will break-before-make MMU for DDR */
update_early_mmu_table(); update_early_mmu_table();
#endif #endif

View file

@ -99,7 +99,7 @@ void ddrmc_init(void)
int dram_init(void) int dram_init(void)
{ {
#if (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) #if (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD))
ddrmc_init(); ddrmc_init();
#endif #endif
@ -125,7 +125,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
/* Clear the BSS */ /* Clear the BSS */

View file

@ -172,14 +172,14 @@ int fsl_initdram(void)
{ {
phys_size_t dram_size; 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"); puts("Initializing DDR....using SPD\n");
dram_size = fsl_ddr_sdram(); dram_size = fsl_ddr_sdram();
#else #else
dram_size = fsl_ddr_sdram_size(); dram_size = fsl_ddr_sdram_size();
#endif #endif
#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_XPL_BUILD)
fsl_dp_resume(); fsl_dp_resume();
#endif #endif

View file

@ -181,7 +181,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
#ifdef CONFIG_NAND_BOOT #ifdef CONFIG_NAND_BOOT

View file

@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
static void ddrmc_init(void) 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; struct ccsr_ddr *ddr = (struct ccsr_ddr *)CFG_SYS_FSL_DDR_ADDR;
u32 temp_sdram_cfg, tmp; u32 temp_sdram_cfg, tmp;
@ -105,7 +105,7 @@ static void ddrmc_init(void)
out_be32(&ddr->sdram_cfg_2, temp_sdram_cfg); out_be32(&ddr->sdram_cfg_2, temp_sdram_cfg);
} }
#endif #endif
#endif /* !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) */ #endif /* !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD) */
} }
int dram_init(void) int dram_init(void)
@ -116,7 +116,7 @@ int dram_init(void)
gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); 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(); fsl_dp_resume();
#endif #endif
@ -156,7 +156,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
void (*second_uboot)(void); void (*second_uboot)(void);
@ -214,7 +214,7 @@ int board_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
void spl_board_init(void) void spl_board_init(void)
{ {
ls102xa_smmu_stream_id_init(); ls102xa_smmu_stream_id_init();

View file

@ -224,7 +224,7 @@ void ddrmc_init(void)
int dram_init(void) int dram_init(void)
{ {
#if (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) #if (!defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD))
ddrmc_init(); ddrmc_init();
#endif #endif
@ -232,7 +232,7 @@ int dram_init(void)
gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); 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(); fsl_dp_resume();
#endif #endif
@ -407,7 +407,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
void (*second_uboot)(void); void (*second_uboot)(void);
@ -527,7 +527,7 @@ int board_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
void spl_board_init(void) void spl_board_init(void)
{ {
if (IS_ENABLED(CONFIG_FSL_CAAM)) { 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) \ #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) static void convert_flash_bank(char bank)
{ {
struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE); struct cpld_data *cpld_data = (void *)(CFG_SYS_CPLD_BASE);

View file

@ -123,7 +123,7 @@ int board_early_init_f(void)
u8 uart; u8 uart;
#endif #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(); i2c_early_init_f();
#endif #endif

View file

@ -5,7 +5,7 @@
# #
obj-y += ddr.o obj-y += ddr.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-y += eth.o obj-y += eth.o
endif endif
obj-y += ls1043aqds.o obj-y += ls1043aqds.o

View file

@ -123,7 +123,7 @@ int fsl_initdram(void)
{ {
phys_size_t dram_size; 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(); gd->ram_size = fsl_ddr_sdram_size();
return 0; return 0;

View file

@ -288,7 +288,7 @@ int dram_init(void)
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0);
fsl_initdram(); fsl_initdram();
#if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ #if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \
defined(CONFIG_SPL_BUILD) defined(CONFIG_XPL_BUILD)
/* This will break-before-make MMU for DDR */ /* This will break-before-make MMU for DDR */
update_early_mmu_table(); update_early_mmu_table();
#endif #endif

View file

@ -4,7 +4,7 @@
obj-y += ddr.o obj-y += ddr.o
obj-y += ls1043ardb.o obj-y += ls1043ardb.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_NET) += eth.o obj-$(CONFIG_NET) += eth.o
obj-y += cpld.o obj-y += cpld.o
endif endif

View file

@ -225,14 +225,14 @@ int fsl_initdram(void)
phys_size_t dram_size; phys_size_t dram_size;
#ifdef CONFIG_SYS_DDR_RAW_TIMING #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"); puts("Initializing DDR....\n");
dram_size = fsl_ddr_sdram(); dram_size = fsl_ddr_sdram();
#else #else
dram_size = fsl_ddr_sdram_size(); dram_size = fsl_ddr_sdram_size();
#endif #endif
#else #else
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) #if defined(CONFIG_XPL_BUILD) || !defined(CONFIG_SPL)
puts("Initialzing DDR using fixed setting\n"); puts("Initialzing DDR using fixed setting\n");
dram_size = fixed_sdram(); dram_size = fixed_sdram();
#else #else

View file

@ -132,7 +132,7 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
int checkboard(void) int checkboard(void)
{ {

Some files were not shown because too many files have changed in this diff Show more