Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include: Use CONFIG_XPL_BUILD instead of CONFIG_SPL_BUILD

Browse source 
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:49 -06:00 • committed by Tom Rini
parent 371dc068bb
commit f38956a687
79 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/asm-generic/global_data.h
View file

@ -55,7 +55,7 @@ struct global_data {
* @cur_serial_dev: current serial device * @cur_serial_dev: current serial device
*/ */
struct udevice *cur_serial_dev; struct udevice *cur_serial_dev;
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
/** /**
* @jt: jump table * @jt: jump table
* *

4
include/bootcount.h
View file

@ -120,13 +120,13 @@ static inline void bootcount_inc(void)
return; return;
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
/* Only increment bootcount when no bootcount support in SPL */ /* Only increment bootcount when no bootcount support in SPL */
#if !defined(CONFIG_SPL_BOOTCOUNT_LIMIT) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT) #if !defined(CONFIG_SPL_BOOTCOUNT_LIMIT) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT)
bootcount_store(++bootcount); bootcount_store(++bootcount);
#endif #endif
env_set_ulong("bootcount", bootcount); env_set_ulong("bootcount", bootcount);
#endif /* !CONFIG_SPL_BUILD */ #endif /* !CONFIG_XPL_BUILD */
} }
#else #else

10
include/config_distro_bootcmd.h
View file

@ -63,7 +63,7 @@
#define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc) #define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc)
#define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV #define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define BOOTENV_SHARED_MMC #define BOOTENV_SHARED_MMC
#define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV_NONE #define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV_NONE
#define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV_NONE #define BOOTENV_DEV_NAME_MMC BOOTENV_DEV_NAME_BLKDEV_NONE
@ -198,7 +198,7 @@
#define BOOTENV_SHARED_SATA BOOTENV_SHARED_BLKDEV(sata) #define BOOTENV_SHARED_SATA BOOTENV_SHARED_BLKDEV(sata)
#define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV #define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define BOOTENV_SHARED_SATA #define BOOTENV_SHARED_SATA
#define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV_NONE #define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV_NONE
#define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV_NONE #define BOOTENV_DEV_NAME_SATA BOOTENV_DEV_NAME_BLKDEV_NONE
@ -305,7 +305,7 @@
BOOTENV_SHARED_BLKDEV_BODY(usb) BOOTENV_SHARED_BLKDEV_BODY(usb)
#define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV
#define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV #define BOOTENV_DEV_NAME_USB BOOTENV_DEV_NAME_BLKDEV
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START
#define BOOTENV_SHARED_USB #define BOOTENV_SHARED_USB
#define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV_NONE #define BOOTENV_DEV_USB BOOTENV_DEV_BLKDEV_NONE
@ -412,7 +412,7 @@
"\0" "\0"
#define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \ #define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \
"dhcp " "dhcp "
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define BOOTENV_DEV_DHCP BOOTENV_DEV_BLKDEV_NONE #define BOOTENV_DEV_DHCP BOOTENV_DEV_BLKDEV_NONE
#define BOOTENV_DEV_NAME_DHCP BOOTENV_DEV_NAME_BLKDEV_NONE #define BOOTENV_DEV_NAME_DHCP BOOTENV_DEV_NAME_BLKDEV_NONE
#else #else
@ -433,7 +433,7 @@
"fi\0" "fi\0"
#define BOOTENV_DEV_NAME_PXE(devtypeu, devtypel, instance) \ #define BOOTENV_DEV_NAME_PXE(devtypeu, devtypel, instance) \
"pxe " "pxe "
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define BOOTENV_DEV_PXE BOOTENV_DEV_BLKDEV_NONE #define BOOTENV_DEV_PXE BOOTENV_DEV_BLKDEV_NONE
#define BOOTENV_DEV_NAME_PXE BOOTENV_DEV_NAME_BLKDEV_NONE #define BOOTENV_DEV_NAME_PXE BOOTENV_DEV_NAME_BLKDEV_NONE
#else #else

4
include/configs/P1010RDB.h
View file

@ -43,7 +43,7 @@
#define CFG_SYS_NAND_U_BOOT_SIZE (576 << 10) #define CFG_SYS_NAND_U_BOOT_SIZE (576 << 10)
#define CFG_SYS_NAND_U_BOOT_DST (0x11000000) #define CFG_SYS_NAND_U_BOOT_DST (0x11000000)
#define CFG_SYS_NAND_U_BOOT_START (0x11000000) #define CFG_SYS_NAND_U_BOOT_START (0x11000000)
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define CFG_SYS_NAND_U_BOOT_SIZE (128 << 10) #define CFG_SYS_NAND_U_BOOT_SIZE (128 << 10)
#define CFG_SYS_NAND_U_BOOT_DST 0xD0000000 #define CFG_SYS_NAND_U_BOOT_DST 0xD0000000
#define CFG_SYS_NAND_U_BOOT_START 0xD0000000 #define CFG_SYS_NAND_U_BOOT_START 0xD0000000
@ -290,7 +290,7 @@ extern unsigned long get_sdram_size(void);
/* /*
* Config the L2 Cache as L2 SRAM * Config the L2 Cache as L2 SRAM
*/ */
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
#define CFG_SYS_INIT_L2_ADDR 0xD0000000 #define CFG_SYS_INIT_L2_ADDR 0xD0000000
#define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR #define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR

4
include/configs/am335x_evm.h
View file

@ -75,7 +75,7 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#include <env/ti/dfu.h> #include <env/ti/dfu.h>
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
@ -181,7 +181,7 @@
#endif /* !CONFIG_MTD_RAW_NAND */ #endif /* !CONFIG_MTD_RAW_NAND */
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define DFUARGS \ #define DFUARGS \
DFU_ALT_INFO_EMMC \ DFU_ALT_INFO_EMMC \
DFU_ALT_INFO_MMC \ DFU_ALT_INFO_MMC \

4
include/configs/am335x_guardian.h
View file

@ -16,7 +16,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */ #define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define MEM_LAYOUT_ENV_SETTINGS \ #define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=0x80000000\0" \ "scriptaddr=0x80000000\0" \
@ -70,7 +70,7 @@
"setenv boot_syslinux_conf \"extlinux/extlinux.conf\"; " \ "setenv boot_syslinux_conf \"extlinux/extlinux.conf\"; " \
"run bootcmd_ubifs0;\0" "run bootcmd_ubifs0;\0"
#endif /* ! CONFIG_SPL_BUILD */ #endif /* ! CONFIG_XPL_BUILD */
#define SPLASH_SCREEN_NAND_PART "nand0,10" #define SPLASH_SCREEN_NAND_PART "nand0,10"
#define SPLASH_SCREEN_BMP_FILE_SIZE 0x26000 #define SPLASH_SCREEN_BMP_FILE_SIZE 0x26000

4
include/configs/am335x_shc.h
View file

@ -20,7 +20,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */ #define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \ "loadaddr=0x80200000\0" \
"kloadaddr=0x84000000\0" \ "kloadaddr=0x84000000\0" \
@ -117,7 +117,7 @@
"setenv mmcpart 5; " \ "setenv mmcpart 5; " \
"fi; " \ "fi; " \
"setenv mmcroot /dev/mmcblk${mmcdev}p${mmcpart};\0" "setenv mmcroot /dev/mmcblk${mmcdev}p${mmcpart};\0"
#endif /* #ifndef CONFIG_SPL_BUILD */ #endif /* #ifndef CONFIG_XPL_BUILD */
#if defined CONFIG_SHC_NETBOOT #if defined CONFIG_SHC_NETBOOT
/* Network Boot */ /* Network Boot */

4
include/configs/am43xx_evm.h
View file

@ -35,7 +35,7 @@
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFUARGS \ #define DFUARGS \
"dfu_bufsiz=0x10000\0" \ "dfu_bufsiz=0x10000\0" \
@ -63,7 +63,7 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#include <env/ti/dfu.h> #include <env/ti/dfu.h>
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \

2
include/configs/am57xx_evm.h
View file

@ -18,7 +18,7 @@
#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ #define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define DFUARGS \ #define DFUARGS \
"dfu_bufsiz=0x10000\0" \ "dfu_bufsiz=0x10000\0" \
DFU_ALT_INFO_MMC \ DFU_ALT_INFO_MMC \

4
include/configs/capricorn-common.h
View file

@ -13,10 +13,10 @@
#include "siemens-env-common.h" #include "siemens-env-common.h"
/* SPL config */ /* SPL config */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
/* ENET1 connects to base board and MUX with ESAI */ /* ENET1 connects to base board and MUX with ESAI */
#define CFG_FEC_ENET_DEV 1 #define CFG_FEC_ENET_DEV 1

2
include/configs/cgtqmx8.h
View file

@ -11,7 +11,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/da850evm.h
View file

@ -157,7 +157,7 @@
"console=ttyS2,115200n8\0" \ "console=ttyS2,115200n8\0" \
"hwconfig=dsp:wake=yes" "hwconfig=dsp:wake=yes"
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* defines for SPL */ /* defines for SPL */
#endif #endif

4
include/configs/dra7xx_evm.h
View file

@ -28,7 +28,7 @@
#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ #define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define DFUARGS \ #define DFUARGS \
"dfu_bufsiz=0x10000\0" \ "dfu_bufsiz=0x10000\0" \
DFU_ALT_INFO_MMC \ DFU_ALT_INFO_MMC \
@ -37,7 +37,7 @@
DFU_ALT_INFO_QSPI DFU_ALT_INFO_QSPI
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#ifdef CONFIG_SPL_DFU #ifdef CONFIG_SPL_DFU
#define DFUARGS \ #define DFUARGS \
"dfu_bufsiz=0x10000\0" \ "dfu_bufsiz=0x10000\0" \

4
include/configs/ds116.h
View file

@ -18,7 +18,7 @@
*/ */
#include "mv-common.h" #include "mv-common.h"
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define KERNEL_ADDR_R __stringify(0x1000000) #define KERNEL_ADDR_R __stringify(0x1000000)
#define FDT_ADDR_R __stringify(0x2000000) #define FDT_ADDR_R __stringify(0x2000000)
@ -39,6 +39,6 @@
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" "console=ttyS0,115200\0"
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#endif /* _CONFIG_DS116_H */ #endif /* _CONFIG_DS116_H */

4
include/configs/ds414.h
View file

@ -43,7 +43,7 @@
*/ */
#include "mv-common.h" #include "mv-common.h"
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define KERNEL_ADDR_R __stringify(0x1000000) #define KERNEL_ADDR_R __stringify(0x1000000)
#define FDT_ADDR_R __stringify(0x2000000) #define FDT_ADDR_R __stringify(0x2000000)
@ -80,6 +80,6 @@
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" "console=ttyS0,115200\0"
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#endif /* _CONFIG_SYNOLOGY_DS414_H */ #endif /* _CONFIG_SYNOLOGY_DS414_H */

2
include/configs/gardena-smart-gateway-mt7688.h
View file

@ -15,7 +15,7 @@
#define CFG_SYS_UBOOT_BASE 0 #define CFG_SYS_UBOOT_BASE 0
/* Serial SPL */ /* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_SERIAL)
#define CFG_SYS_NS16550_CLK 40000000 #define CFG_SYS_NS16550_CLK 40000000
#define CFG_SYS_NS16550_COM1 0xb0000c00 #define CFG_SYS_NS16550_COM1 0xb0000c00
#endif #endif

2
include/configs/imx6q-bosch-acc.h
View file

@ -92,7 +92,7 @@
/* SPL */ /* SPL */
#ifdef CONFIG_SPL #ifdef CONFIG_SPL
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_USDHC_NUM 2
#ifdef CONFIG_SYS_BOOT_EMMC #ifdef CONFIG_SYS_BOOT_EMMC

4
include/configs/imx6ulz_smm_m2.h
View file

@ -14,14 +14,14 @@
#define CFG_MXC_UART_BASE UART4_BASE #define CFG_MXC_UART_BASE UART4_BASE
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(NAND, nand, 0) \ func(NAND, nand, 0) \
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif /* !CONFIG_SPL_BUILD */ #endif /* !CONFIG_XPL_BUILD */
#define MEM_LAYOUT_ENV_SETTINGS \ #define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

2
include/configs/imx8mm-cl-iot-gate.h
View file

@ -14,7 +14,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x912000 #define CFG_MALLOC_F_ADDR 0x912000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

2
include/configs/imx8mm_beacon.h
View file

@ -21,7 +21,7 @@
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

2
include/configs/imx8mm_data_modul_edm_sbc.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

2
include/configs/imx8mm_evk.h
View file

@ -22,7 +22,7 @@
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

4
include/configs/imx8mm_icore_mx8mm.h
View file

@ -13,11 +13,11 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
# define CFG_MALLOC_F_ADDR 0x930000 # define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \

2
include/configs/imx8mm_phg.h
View file

@ -14,7 +14,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
#endif #endif

2
include/configs/imx8mm_venice.h
View file

@ -12,7 +12,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
#endif #endif

2
include/configs/imx8mp_rsb3720.h
View file

@ -23,7 +23,7 @@
EFI_GUID(0xb5fb6f08, 0xe142, 0x4db1, 0x97, 0xea, \ EFI_GUID(0xb5fb6f08, 0xe142, 0x4db1, 0x97, 0xea, \
0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9) 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ #define CFG_MALLOC_F_ADDR 0x184000 /* malloc f used before \
* GD_FLG_FULL_MALLOC_INIT \ * GD_FLG_FULL_MALLOC_INIT \
* set \ * set \

2
include/configs/imx8mq_cm.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x182000 #define CFG_MALLOC_F_ADDR 0x182000

2
include/configs/imx8mq_evk.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */

2
include/configs/imx8mq_phanbell.h
View file

@ -9,7 +9,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */

2
include/configs/imx8mq_reform2.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */

2
include/configs/imx8qm_mek.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/imx8qxp_mek.h
View file

@ -10,7 +10,7 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x00120000 #define CFG_MALLOC_F_ADDR 0x00120000
#endif #endif

2
include/configs/imx8ulp_evk.h
View file

@ -11,7 +11,7 @@
#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x22040000 #define CFG_MALLOC_F_ADDR 0x22040000
#endif #endif

2
include/configs/imx93_evk.h
View file

@ -13,7 +13,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MALLOC_F_ADDR 0x204D0000 #define CFG_MALLOC_F_ADDR 0x204D0000
#endif #endif

4
include/configs/kontron-sl-mx8mm.h
View file

@ -10,7 +10,7 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#include <config.h> #include <config.h>
#endif #endif
@ -39,7 +39,7 @@
#undef BOOTENV_RUN_NET_USB_START #undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
#endif #endif

2
include/configs/kontron_pitx_imx8m.h
View file

@ -12,7 +12,7 @@
EFI_GUID(0xc898e959, 0x5b1f, 0x4e6d, 0x88, 0xe0, \ EFI_GUID(0xc898e959, 0x5b1f, 0x4e6d, 0x88, 0xe0, \
0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99) 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x182000 #define CFG_MALLOC_F_ADDR 0x182000

2
include/configs/librem5.h
View file

@ -41,7 +41,7 @@
#define CONSOLE "ttymxc0" #define CONSOLE "ttymxc0"
#endif #endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \

2
include/configs/linkit-smart-7688.h
View file

@ -15,7 +15,7 @@
#define CFG_SYS_UBOOT_BASE 0 #define CFG_SYS_UBOOT_BASE 0
/* Serial SPL */ /* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_SERIAL)
#define CFG_SYS_NS16550_CLK 40000000 #define CFG_SYS_NS16550_CLK 40000000
#define CFG_SYS_NS16550_COM3 0xb0000e00 #define CFG_SYS_NS16550_COM3 0xb0000e00

6
include/configs/ls1043a_common.h
View file

@ -8,7 +8,7 @@
#define __LS1043A_COMMON_H #define __LS1043A_COMMON_H
/* SPL build */ /* SPL build */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define SPL_NO_FMAN #define SPL_NO_FMAN
#define SPL_NO_DSPI #define SPL_NO_DSPI
#define SPL_NO_PCIE #define SPL_NO_PCIE
@ -19,10 +19,10 @@
#define SPL_NO_QE #define SPL_NO_QE
#define SPL_NO_EEPROM #define SPL_NO_EEPROM
#endif #endif
#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) #if (defined(CONFIG_XPL_BUILD) && defined(CONFIG_NAND_BOOT))
#define SPL_NO_MMC #define SPL_NO_MMC
#endif #endif
#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT_QSPI)) #if (defined(CONFIG_XPL_BUILD) && defined(CONFIG_SD_BOOT_QSPI))
#define SPL_NO_IFC #define SPL_NO_IFC
#endif #endif

6
include/configs/ls1046a_common.h
View file

@ -8,7 +8,7 @@
#define __LS1046A_COMMON_H #define __LS1046A_COMMON_H
/* SPL build */ /* SPL build */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define SPL_NO_QBMAN #define SPL_NO_QBMAN
#define SPL_NO_FMAN #define SPL_NO_FMAN
#define SPL_NO_ENV #define SPL_NO_ENV
@ -17,11 +17,11 @@
#define SPL_NO_USB #define SPL_NO_USB
#define SPL_NO_SATA #define SPL_NO_SATA
#endif #endif
#if defined(CONFIG_SPL_BUILD) && \ #if defined(CONFIG_XPL_BUILD) && \
(defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT))
#define SPL_NO_MMC #define SPL_NO_MMC
#endif #endif
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#define SPL_NO_IFC #define SPL_NO_IFC
#endif #endif

2
include/configs/ls1088a_common.h
View file

@ -7,7 +7,7 @@
#define __LS1088_COMMON_H #define __LS1088_COMMON_H
/* SPL build */ /* SPL build */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define SPL_NO_BOARDINFO #define SPL_NO_BOARDINFO
#define SPL_NO_QIXIS #define SPL_NO_QIXIS
#define SPL_NO_PCI #define SPL_NO_PCI

2
include/configs/msc_sm2s_imx8mp.h
View file

@ -20,7 +20,7 @@
#define CFG_FEC_MXC_PHYADDR 1 #define CFG_FEC_MXC_PHYADDR 1
#endif #endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) func(MMC, mmc, 2)

2
include/configs/mt7621.h
View file

@ -15,7 +15,7 @@
#define CFG_SYS_INIT_SP_OFFSET 0x800000 #define CFG_SYS_INIT_SP_OFFSET 0x800000
/* Serial SPL */ /* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_SERIAL)
#define CFG_SYS_NS16550_CLK 50000000 #define CFG_SYS_NS16550_CLK 50000000
#define CFG_SYS_NS16550_COM1 0xbe000c00 #define CFG_SYS_NS16550_COM1 0xbe000c00
#endif #endif

2
include/configs/mt7628.h
View file

@ -13,7 +13,7 @@
#define CFG_SYS_INIT_SP_OFFSET 0x80000 #define CFG_SYS_INIT_SP_OFFSET 0x80000
/* Serial SPL */ /* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_SERIAL)
#define CFG_SYS_NS16550_CLK 40000000 #define CFG_SYS_NS16550_CLK 40000000
#define CFG_SYS_NS16550_COM1 0xb0000c00 #define CFG_SYS_NS16550_COM1 0xb0000c00
#endif #endif

4
include/configs/n2350.h
View file

@ -18,7 +18,7 @@
*/ */
#include "mv-common.h" #include "mv-common.h"
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define KERNEL_ADDR_R __stringify(0x1000000) #define KERNEL_ADDR_R __stringify(0x1000000)
#define FDT_ADDR_R __stringify(0x2000000) #define FDT_ADDR_R __stringify(0x2000000)
@ -39,6 +39,6 @@
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" "console=ttyS0,115200\0"
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#endif /* _CONFIG_N2350_H */ #endif /* _CONFIG_N2350_H */

4
include/configs/p1_p2_rdb_pc.h
View file

@ -98,7 +98,7 @@
#define CFG_SYS_NAND_U_BOOT_SIZE (832 << 10) #define CFG_SYS_NAND_U_BOOT_SIZE (832 << 10)
#define CFG_SYS_NAND_U_BOOT_DST (0x11000000) #define CFG_SYS_NAND_U_BOOT_DST (0x11000000)
#define CFG_SYS_NAND_U_BOOT_START (0x11000000) #define CFG_SYS_NAND_U_BOOT_START (0x11000000)
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define CFG_SYS_NAND_U_BOOT_SIZE (128 << 10) #define CFG_SYS_NAND_U_BOOT_SIZE (128 << 10)
#define CFG_SYS_NAND_U_BOOT_DST 0xf8f80000 #define CFG_SYS_NAND_U_BOOT_DST 0xf8f80000
#define CFG_SYS_NAND_U_BOOT_START 0xf8f80000 #define CFG_SYS_NAND_U_BOOT_START 0xf8f80000
@ -280,7 +280,7 @@
/* /*
* Config the L2 Cache as L2 SRAM * Config the L2 Cache as L2 SRAM
*/ */
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_XPL_BUILD)
#if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
#define CFG_SYS_INIT_L2_ADDR 0xf8f80000 #define CFG_SYS_INIT_L2_ADDR 0xf8f80000
#define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR #define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR

2
include/configs/phycore_imx8mm.h
View file

@ -14,7 +14,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

2
include/configs/pico-imx8mq.h
View file

@ -9,7 +9,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */

4
include/configs/rk3399_common.h
View file

@ -13,7 +13,7 @@
#define CFG_SYS_SDRAM_BASE 0 #define CFG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xf8000000 #define SDRAM_MAX_SIZE 0xf8000000
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#ifndef ROCKCHIP_DEVICE_SETTINGS #ifndef ROCKCHIP_DEVICE_SETTINGS
#define ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS
@ -38,6 +38,6 @@
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
"boot_targets=" BOOT_TARGETS "\0" "boot_targets=" BOOT_TARGETS "\0"
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#endif /* __CONFIG_RK3399_COMMON_H */ #endif /* __CONFIG_RK3399_COMMON_H */

2
include/configs/rockchip-common.h
View file

@ -11,7 +11,7 @@
#define CFG_CPUID_OFFSET 0x7 #define CFG_CPUID_OFFSET 0x7
#endif #endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" #define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"

2
include/configs/socfpga_common.h
View file

@ -117,7 +117,7 @@
/* SPL NAND boot support */ /* SPL NAND boot support */
/* Extra Environment */ /* Extra Environment */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#ifdef CONFIG_CMD_DHCP #ifdef CONFIG_CMD_DHCP
#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) #define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)

4
include/configs/stm32mp15_common.h
View file

@ -33,7 +33,7 @@
#ifdef CONFIG_DISTRO_DEFAULTS #ifdef CONFIG_DISTRO_DEFAULTS
/*****************************************************************************/ /*****************************************************************************/
#if !defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_XPL_BUILD)
#ifdef CONFIG_CMD_MMC #ifdef CONFIG_CMD_MMC
#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0) #define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0)
@ -129,7 +129,7 @@
STM32MP_EXTRA \ STM32MP_EXTRA \
STM32MP_BOARD_EXTRA_ENV STM32MP_BOARD_EXTRA_ENV
#endif /* ifndef CONFIG_SPL_BUILD */ #endif /* ifndef CONFIG_XPL_BUILD */
#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/ #endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
#endif /* __CONFIG_STM32MP15_COMMMON_H */ #endif /* __CONFIG_STM32MP15_COMMMON_H */

2
include/configs/stm32mp15_dh_dhsom.h
View file

@ -10,7 +10,7 @@
/* PHY needs a longer autoneg timeout */ /* PHY needs a longer autoneg timeout */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
"dfu_alt_info_ram=u-boot.itb ram " \ "dfu_alt_info_ram=u-boot.itb ram " \
__stringify(CONFIG_SPL_LOAD_FIT_ADDRESS) \ __stringify(CONFIG_SPL_LOAD_FIT_ADDRESS) \

2
include/configs/ti_omap3_common.h
View file

@ -31,7 +31,7 @@
115200} 115200}
/* Select serial console configuration */ /* Select serial console configuration */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_SYS_NS16550_COM1 OMAP34XX_UART1 #define CFG_SYS_NS16550_COM1 OMAP34XX_UART1
#define CFG_SYS_NS16550_COM2 OMAP34XX_UART2 #define CFG_SYS_NS16550_COM2 OMAP34XX_UART2
#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CFG_SYS_NS16550_COM3 OMAP34XX_UART3

2
include/configs/ti_omap4_common.h
View file

@ -95,7 +95,7 @@
* So moving TEXT_BASE down to non-HS limit. * So moving TEXT_BASE down to non-HS limit.
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */
#endif #endif

4
include/configs/turris_1x.h
View file

@ -63,7 +63,7 @@
/* /*
* For SD card builds without SPL it is needed to set CONFIG_SYS_RAMBOOT * For SD card builds without SPL it is needed to set CONFIG_SYS_RAMBOOT
* *
* if CONFIG_SPL_BUILD * if CONFIG_XPL_BUILD
* if CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR * if CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR
* define CONFIG_SPL_MAX_SIZE = (CONFIG_SYS_L2_SIZE+CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * define CONFIG_SPL_MAX_SIZE = (CONFIG_SYS_L2_SIZE+CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA
* * SZ_512) * * SZ_512)
@ -121,7 +121,7 @@
*/ */
/* Initial SRAM is used only for SD card boot in first stage image */ /* Initial SRAM is used only for SD card boot in first stage image */
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_SPL) || defined(CONFIG_XPL_BUILD)
#define CFG_SYS_INIT_L2_ADDR 0xf8f80000 #define CFG_SYS_INIT_L2_ADDR 0xf8f80000
#define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR #define CFG_SYS_INIT_L2_ADDR_PHYS CFG_SYS_INIT_L2_ADDR
/* /*

4
include/configs/turris_omnia.h
View file

@ -31,7 +31,7 @@
#include "mv-common.h" #include "mv-common.h"
/* Include the common distro boot environment */ /* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
@ -86,6 +86,6 @@
"bootcmd_rescue=" TURRIS_OMNIA_BOOTCMD_RESCUE "\0" \ "bootcmd_rescue=" TURRIS_OMNIA_BOOTCMD_RESCUE "\0" \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#endif /* _CONFIG_TURRIS_OMNIA_H */ #endif /* _CONFIG_TURRIS_OMNIA_H */

2
include/configs/verdin-imx8mm.h
View file

@ -12,7 +12,7 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x930000 #define CFG_MALLOC_F_ADDR 0x930000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */

4
include/configs/verdin-imx8mp.h
View file

@ -12,13 +12,13 @@
#define CFG_SYS_UBOOT_BASE \ #define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
#define CFG_MALLOC_F_ADDR 0x184000 #define CFG_MALLOC_F_ADDR 0x184000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
#define MEM_LAYOUT_ENV_SETTINGS \ #define MEM_LAYOUT_ENV_SETTINGS \
"fdt_addr_r=0x50200000\0" \ "fdt_addr_r=0x50200000\0" \

2
include/configs/vining_2000.h
View file

@ -47,7 +47,7 @@
/* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */ /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */
#endif #endif
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define CFG_MXC_UART_BASE UART1_BASE #define CFG_MXC_UART_BASE UART1_BASE
#endif #endif

2
include/configs/xilinx_zynqmp.h
View file

@ -183,7 +183,7 @@
#endif #endif
/* SPL can't handle all huge variables - define just DFU */ /* SPL can't handle all huge variables - define just DFU */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) #if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_DFU)
#undef CFG_EXTRA_ENV_SETTINGS #undef CFG_EXTRA_ENV_SETTINGS
# define CFG_EXTRA_ENV_SETTINGS \ # define CFG_EXTRA_ENV_SETTINGS \
"dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \ "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \

4
include/configs/zynq-common.h
View file

@ -44,7 +44,7 @@
/* Boot configuration */ /* Boot configuration */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define BOOTENV #define BOOTENV
#else #else
@ -167,7 +167,7 @@
BOOT_TARGET_DEVICES_DHCP(func) BOOT_TARGET_DEVICES_DHCP(func)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_XPL_BUILD */
/* Default environment */ /* Default environment */
#ifndef CFG_EXTRA_ENV_SETTINGS #ifndef CFG_EXTRA_ENV_SETTINGS

2
include/env.h
View file

@ -44,7 +44,7 @@ struct env_clbk_tbl {
* For SPL these are silently dropped to reduce code size, since environment * For SPL these are silently dropped to reduce code size, since environment
* callbacks are not supported with SPL. * callbacks are not supported with SPL.
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#define U_BOOT_ENV_CALLBACK(name, callback) \ #define U_BOOT_ENV_CALLBACK(name, callback) \
static inline __maybe_unused void _u_boot_env_noop_##name(void) \ static inline __maybe_unused void _u_boot_env_noop_##name(void) \
{ \ { \

2
include/env_callback.h
View file

@ -85,7 +85,7 @@
"serial#:serialno," \ "serial#:serialno," \
CFG_ENV_CALLBACK_LIST_STATIC CFG_ENV_CALLBACK_LIST_STATIC
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
void env_callback_init(struct env_entry *var_entry); void env_callback_init(struct env_entry *var_entry);
#else #else
static inline void env_callback_init(struct env_entry *var_entry) static inline void env_callback_init(struct env_entry *var_entry)

2
include/fdtdec.h
View file

@ -143,7 +143,7 @@ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */
static inline u8 *dtb_dt_embedded(void) static inline u8 *dtb_dt_embedded(void)
{ {
#ifdef CONFIG_OF_EMBED #ifdef CONFIG_OF_EMBED
# ifdef CONFIG_SPL_BUILD # ifdef CONFIG_XPL_BUILD
return __dtb_dt_spl_begin; return __dtb_dt_spl_begin;
# else # else
return __dtb_dt_begin; return __dtb_dt_begin;

2
include/image-android-dt.h
View file

@ -13,7 +13,7 @@ bool android_dt_check_header(ulong hdr_addr);
bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr, bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr,
u32 *size); u32 *size);
#if !defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_XPL_BUILD)
void android_dt_print_contents(ulong hdr_addr); void android_dt_print_contents(ulong hdr_addr);
#endif #endif

2
include/iotrace.h
View file

@ -42,7 +42,7 @@ struct iotrace_record {
*/ */
#if defined(CONFIG_IO_TRACE) && !defined(IOTRACE_IMPL) && \ #if defined(CONFIG_IO_TRACE) && !defined(IOTRACE_IMPL) && \
!defined(CONFIG_SPL_BUILD) !defined(CONFIG_XPL_BUILD)
#undef readl #undef readl
#define readl(addr) iotrace_readl((const void *)(addr)) #define readl(addr) iotrace_readl((const void *)(addr))

18
include/linux/kconfig.h
View file

@ -40,7 +40,7 @@
#define _CONFIG_PREFIX TPL_ #define _CONFIG_PREFIX TPL_
#elif defined(CONFIG_VPL_BUILD) #elif defined(CONFIG_VPL_BUILD)
#define _CONFIG_PREFIX VPL_ #define _CONFIG_PREFIX VPL_
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
#define _CONFIG_PREFIX SPL_ #define _CONFIG_PREFIX SPL_
#else #else
#define _CONFIG_PREFIX #define _CONFIG_PREFIX
@ -53,8 +53,8 @@
/* /*
* CONFIG_VAL(FOO) evaluates to the value of * CONFIG_VAL(FOO) evaluates to the value of
* CONFIG_TOOLS_FOO if USE_HOSTCC is defined, * CONFIG_TOOLS_FOO if USE_HOSTCC is defined,
* CONFIG_FOO if CONFIG_SPL_BUILD is undefined, * CONFIG_FOO if CONFIG_XPL_BUILD is undefined,
* CONFIG_SPL_FOO if CONFIG_SPL_BUILD is defined. * CONFIG_SPL_FOO if CONFIG_XPL_BUILD is defined.
* CONFIG_TPL_FOO if CONFIG_TPL_BUILD is defined. * CONFIG_TPL_FOO if CONFIG_TPL_BUILD is defined.
* CONFIG_VPL_FOO if CONFIG_VPL_BUILD is defined. * CONFIG_VPL_FOO if CONFIG_VPL_BUILD is defined.
*/ */
@ -106,22 +106,22 @@ long invalid_use_of_IF_ENABLED_INT(void);
/* /*
* CONFIG_IS_ENABLED(FOO) expands to * CONFIG_IS_ENABLED(FOO) expands to
* 1 if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * 1 if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y', * 1 if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * 1 if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y', * 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* 0 otherwise. * 0 otherwise.
* *
* CONFIG_IS_ENABLED(FOO, (abc)) expands to * CONFIG_IS_ENABLED(FOO, (abc)) expands to
* abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* abc if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* abc if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y', * abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* nothing otherwise. * nothing otherwise.
* *
* CONFIG_IS_ENABLED(FOO, (abc), (def)) expands to * CONFIG_IS_ENABLED(FOO, (abc), (def)) expands to
* abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* abc if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* abc if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y', * abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* def otherwise. * def otherwise.
* *

2
include/mmc.h
View file

@ -725,7 +725,7 @@ struct mmc {
u64 capacity_boot; u64 capacity_boot;
u64 capacity_rpmb; u64 capacity_rpmb;
u64 capacity_gp[4]; u64 capacity_gp[4];
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
u64 enh_user_start; u64 enh_user_start;
u64 enh_user_size; u64 enh_user_size;
#endif #endif

2
include/mtd/cfi_flash.h
View file

@ -163,7 +163,7 @@ struct cfi_pri_hdr {
#if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT) #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT)
/* map to cfi_flash_num_flash_banks only when supported */ /* map to cfi_flash_num_flash_banks only when supported */
#if IS_ENABLED(CONFIG_FLASH_CFI_DRIVER) && \ #if IS_ENABLED(CONFIG_FLASH_CFI_DRIVER) && \
(!IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_SPL_MTD)) (!IS_ENABLED(CONFIG_XPL_BUILD) || IS_ENABLED(CONFIG_SPL_MTD))
#define CFI_FLASH_BANKS (cfi_flash_num_flash_banks) #define CFI_FLASH_BANKS (cfi_flash_num_flash_banks)
/* board code can update this variable before CFI detection */ /* board code can update this variable before CFI detection */
extern int cfi_flash_num_flash_banks; extern int cfi_flash_num_flash_banks;

6
include/net.h
View file

@ -683,7 +683,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport,
/* Processes a received packet */ /* Processes a received packet */
void net_process_received_packet(uchar *in_packet, int len); void net_process_received_packet(uchar *in_packet, int len);
#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_XPL_BUILD)
void nc_start(void); void nc_start(void);
int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
unsigned src_port, unsigned len); unsigned src_port, unsigned len);
@ -691,7 +691,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
static __always_inline int eth_is_on_demand_init(void) static __always_inline int eth_is_on_demand_init(void)
{ {
#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_XPL_BUILD)
extern enum proto_t net_loop_last_protocol; extern enum proto_t net_loop_last_protocol;
return net_loop_last_protocol != NETCONS; return net_loop_last_protocol != NETCONS;
@ -702,7 +702,7 @@ static __always_inline int eth_is_on_demand_init(void)
static inline void eth_set_last_protocol(int protocol) static inline void eth_set_last_protocol(int protocol)
{ {
#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_XPL_BUILD)
extern enum proto_t net_loop_last_protocol; extern enum proto_t net_loop_last_protocol;
net_loop_last_protocol = protocol; net_loop_last_protocol = protocol;

2
include/part.h
View file

@ -439,7 +439,7 @@ ulong disk_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt);
* We don't support printing partition information in SPL and only support * We don't support printing partition information in SPL and only support
* getting partition information in a few cases. * getting partition information in a few cases.
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
# define part_print_ptr(x) NULL # define part_print_ptr(x) NULL
# if defined(CONFIG_SPL_FS_EXT4) || defined(CONFIG_SPL_FS_FAT) || \ # if defined(CONFIG_SPL_FS_EXT4) || defined(CONFIG_SPL_FS_FAT) || \
defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION) defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION)

2
include/sdp.h
View file

@ -11,7 +11,7 @@
int sdp_init(struct udevice *udc); int sdp_init(struct udevice *udc);
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
#include <spl.h> #include <spl.h>
int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image, int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,

2
include/search.h
View file

@ -29,7 +29,7 @@ enum env_action {
struct env_entry { struct env_entry {
const char *key; const char *key;
char *data; char *data;
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_XPL_BUILD
int (*callback)(const char *name, const char *value, enum env_op op, int (*callback)(const char *name, const char *value, enum env_op op,
int flags); int flags);
#endif #endif

14
include/spl.h
View file

@ -53,7 +53,7 @@ static inline bool xpl_is_first_phase(void)
if (IS_ENABLED(CONFIG_TPL_BUILD)) if (IS_ENABLED(CONFIG_TPL_BUILD))
return true; return true;
} else if (IS_ENABLED(CONFIG_SPL)) { } else if (IS_ENABLED(CONFIG_SPL)) {
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_XPL_BUILD))
return true; return true;
} else { } else {
return true; return true;
@ -92,7 +92,7 @@ enum xpl_phase_t {
* *
* To include code only in SPL, you might do: * To include code only in SPL, you might do:
* *
* #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD) * #if defined(CONFIG_XPL_BUILD) && !defined(CONFIG_TPL_BUILD)
* ... * ...
* #endif * #endif
* *
@ -104,7 +104,7 @@ enum xpl_phase_t {
* *
* To include code only in U-Boot proper, you might do: * To include code only in U-Boot proper, you might do:
* *
* #ifndef CONFIG_SPL_BUILD * #ifndef CONFIG_XPL_BUILD
* ... * ...
* #endif * #endif
* *
@ -122,7 +122,7 @@ static inline enum xpl_phase_t xpl_phase(void)
return PHASE_TPL; return PHASE_TPL;
#elif defined(CONFIG_VPL_BUILD) #elif defined(CONFIG_VPL_BUILD)
return PHASE_VPL; return PHASE_VPL;
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
return PHASE_SPL; return PHASE_SPL;
#else #else
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -137,7 +137,7 @@ static inline enum xpl_phase_t xpl_phase(void)
/* returns true if in U-Boot proper, false if in xPL */ /* returns true if in U-Boot proper, false if in xPL */
static inline bool not_xpl(void) static inline bool not_xpl(void)
{ {
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
return false; return false;
#endif #endif
@ -166,7 +166,7 @@ static inline enum xpl_phase_t xpl_prev_phase(void)
return PHASE_NONE; return PHASE_NONE;
#elif defined(CONFIG_VPL_BUILD) #elif defined(CONFIG_VPL_BUILD)
return PHASE_TPL; /* VPL requires TPL */ return PHASE_TPL; /* VPL requires TPL */
#elif defined(CONFIG_SPL_BUILD) #elif defined(CONFIG_XPL_BUILD)
return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL : return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL :
IS_ENABLED(CONFIG_TPL) ? PHASE_TPL : IS_ENABLED(CONFIG_TPL) ? PHASE_TPL :
PHASE_NONE; PHASE_NONE;
@ -239,7 +239,7 @@ static inline const char *xpl_prefix(enum xpl_phase_t phase)
} }
/* A string name for SPL or TPL */ /* A string name for SPL or TPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_XPL_BUILD
# ifdef CONFIG_TPL_BUILD # ifdef CONFIG_TPL_BUILD
# define SPL_TPL_NAME "TPL" # define SPL_TPL_NAME "TPL"
# elif defined(CONFIG_VPL_BUILD) # elif defined(CONFIG_VPL_BUILD)

2
include/stdio.h
View file

@ -9,7 +9,7 @@ int getchar(void);
int tstc(void); int tstc(void);
/* stdout */ /* stdout */
#if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(SERIAL) #if !defined(CONFIG_XPL_BUILD) || CONFIG_IS_ENABLED(SERIAL)
void putc(const char c); void putc(const char c);
void puts(const char *s); void puts(const char *s);
#ifdef CONFIG_CONSOLE_FLUSH_SUPPORT #ifdef CONFIG_CONSOLE_FLUSH_SUPPORT

2
include/sunxi_gpio.h
View file

@ -206,7 +206,7 @@ void sunxi_gpio_set_pull(u32 pin, u32 val);
void sunxi_gpio_set_pull_bank(void *bank_base, int pin_offset, u32 val); void sunxi_gpio_set_pull_bank(void *bank_base, int pin_offset, u32 val);
int sunxi_name_to_gpio(const char *name); int sunxi_name_to_gpio(const char *name);
#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO #if !defined CONFIG_XPL_BUILD && defined CONFIG_AXP_GPIO
int axp_gpio_init(void); int axp_gpio_init(void);
#else #else
static inline int axp_gpio_init(void) { return 0; } static inline int axp_gpio_init(void) { return 0; }

4
include/upl.h
View file

@ -320,7 +320,7 @@ int upl_read_handoff(struct upl *upl, oftree tree);
int upl_get_test_data(struct unit_test_state *uts, struct upl *upl); int upl_get_test_data(struct unit_test_state *uts, struct upl *upl);
#endif /* USE_HOSTCC */ #endif /* USE_HOSTCC */
#if CONFIG_IS_ENABLED(UPL) && defined(CONFIG_SPL_BUILD) #if CONFIG_IS_ENABLED(UPL) && defined(CONFIG_XPL_BUILD)
/** /**
* upl_set_fit_info() - Set up basic info about the FIT * upl_set_fit_info() - Set up basic info about the FIT
@ -367,7 +367,7 @@ int _upl_add_image(int node, ulong load_addr, ulong size, const char *desc);
static inline int upl_add_image(const void *fit, int node, ulong load_addr, static inline int upl_add_image(const void *fit, int node, ulong load_addr,
ulong size) ulong size)
{ {
if (CONFIG_IS_ENABLED(UPL) && IS_ENABLED(CONFIG_SPL_BUILD)) { if (CONFIG_IS_ENABLED(UPL) && IS_ENABLED(CONFIG_XPL_BUILD)) {
const char *desc = fdt_getprop(fit, node, FIT_DESC_PROP, NULL); const char *desc = fdt_getprop(fit, node, FIT_DESC_PROP, NULL);
return _upl_add_image(node, load_addr, size, desc); return _upl_add_image(node, load_addr, size, desc);

2
include/vbe.h
View file

@ -41,7 +41,7 @@ struct vbe_handoff {
*/ */
static inline enum vbe_phase_t vbe_phase(void) static inline enum vbe_phase_t vbe_phase(void)
{ {
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_XPL_BUILD))
return VBE_PHASE_FIRMWARE; return VBE_PHASE_FIRMWARE;
return VBE_PHASE_OS; return VBE_PHASE_OS;