diff options
Diffstat (limited to 'arch/arm/mach-k3')
-rw-r--r-- | arch/arm/mach-k3/am62ax/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/am62px/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/am62x/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/am64x/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/am65x/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/arm64/cache.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/j721e/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/j721s2/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/j721s2/j721s2_init.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/j722s/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/j784s4/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/r5/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/security.c | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-k3/am62ax/Makefile b/arch/arm/mach-k3/am62ax/Makefile index 1717ca343d6..e2ef88196f8 100644 --- a/arch/arm/mach-k3/am62ax/Makefile +++ b/arch/arm/mach-k3/am62ax/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += am62a7_fdt.o -obj-$(CONFIG_SPL_BUILD) += am62a7_init.o +obj-$(CONFIG_XPL_BUILD) += am62a7_init.o diff --git a/arch/arm/mach-k3/am62px/Makefile b/arch/arm/mach-k3/am62px/Makefile index eed91a033eb..3165435f265 100644 --- a/arch/arm/mach-k3/am62px/Makefile +++ b/arch/arm/mach-k3/am62px/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += am62p5_fdt.o -obj-$(CONFIG_SPL_BUILD) += am62p5_init.o +obj-$(CONFIG_XPL_BUILD) += am62p5_init.o diff --git a/arch/arm/mach-k3/am62x/Makefile b/arch/arm/mach-k3/am62x/Makefile index 8494cdda482..ca10b6a8d3d 100644 --- a/arch/arm/mach-k3/am62x/Makefile +++ b/arch/arm/mach-k3/am62x/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_OF_SYSTEM_SETUP) += am625_fdt.o -obj-$(CONFIG_SPL_BUILD) += am625_init.o +obj-$(CONFIG_XPL_BUILD) += am625_init.o obj-y += boot.o diff --git a/arch/arm/mach-k3/am64x/Makefile b/arch/arm/mach-k3/am64x/Makefile index d0b286276c8..053a8239999 100644 --- a/arch/arm/mach-k3/am64x/Makefile +++ b/arch/arm/mach-k3/am64x/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-$(CONFIG_SPL_BUILD) += am642_init.o +obj-$(CONFIG_XPL_BUILD) += am642_init.o obj-y += boot.o diff --git a/arch/arm/mach-k3/am65x/Makefile b/arch/arm/mach-k3/am65x/Makefile index 20d5f1d3bf1..34734f24ff7 100644 --- a/arch/arm/mach-k3/am65x/Makefile +++ b/arch/arm/mach-k3/am65x/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += am654_fdt.o -obj-$(CONFIG_SPL_BUILD) += am654_init.o +obj-$(CONFIG_XPL_BUILD) += am654_init.o diff --git a/arch/arm/mach-k3/arm64/cache.S b/arch/arm/mach-k3/arm64/cache.S index 17cfb12f108..6a507ae3af5 100644 --- a/arch/arm/mach-k3/arm64/cache.S +++ b/arch/arm/mach-k3/arm64/cache.S @@ -7,7 +7,7 @@ #include <config.h> #include <linux/linkage.h> -#if defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_XPL_BUILD) ENTRY(__asm_invalidate_l3_dcache) /* Invalidate SPL address range */ mov x0, #CONFIG_SPL_TEXT_BASE diff --git a/arch/arm/mach-k3/j721e/Makefile b/arch/arm/mach-k3/j721e/Makefile index 982b88db57d..e4b0e5a8193 100644 --- a/arch/arm/mach-k3/j721e/Makefile +++ b/arch/arm/mach-k3/j721e/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += j721e_fdt.o -obj-$(CONFIG_SPL_BUILD) += j721e_init.o +obj-$(CONFIG_XPL_BUILD) += j721e_init.o diff --git a/arch/arm/mach-k3/j721s2/Makefile b/arch/arm/mach-k3/j721s2/Makefile index ceef68297c9..051ef1b11d8 100644 --- a/arch/arm/mach-k3/j721s2/Makefile +++ b/arch/arm/mach-k3/j721s2/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += j721s2_fdt.o -obj-$(CONFIG_SPL_BUILD) += j721s2_init.o +obj-$(CONFIG_XPL_BUILD) += j721s2_init.o diff --git a/arch/arm/mach-k3/j721s2/j721s2_init.c b/arch/arm/mach-k3/j721s2/j721s2_init.c index 05453fcad41..64c34d3dbd6 100644 --- a/arch/arm/mach-k3/j721s2/j721s2_init.c +++ b/arch/arm/mach-k3/j721s2/j721s2_init.c @@ -312,7 +312,7 @@ void do_dt_magic(void) } #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD void board_init_f(ulong dummy) { k3_spl_init(); diff --git a/arch/arm/mach-k3/j722s/Makefile b/arch/arm/mach-k3/j722s/Makefile index 2b1fec131ed..9b0dd8afd8b 100644 --- a/arch/arm/mach-k3/j722s/Makefile +++ b/arch/arm/mach-k3/j722s/Makefile @@ -4,4 +4,4 @@ # Jayesh Choudhary <j-choudhary@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += j722s_fdt.o -obj-$(CONFIG_SPL_BUILD) += j722s_init.o +obj-$(CONFIG_XPL_BUILD) += j722s_init.o diff --git a/arch/arm/mach-k3/j784s4/Makefile b/arch/arm/mach-k3/j784s4/Makefile index 6d1841e3f9e..1d51bcf6e8c 100644 --- a/arch/arm/mach-k3/j784s4/Makefile +++ b/arch/arm/mach-k3/j784s4/Makefile @@ -4,4 +4,4 @@ # Andrew Davis <afd@ti.com> obj-$(CONFIG_OF_SYSTEM_SETUP) += j784s4_fdt.o -obj-$(CONFIG_SPL_BUILD) += j784s4_init.o +obj-$(CONFIG_XPL_BUILD) += j784s4_init.o diff --git a/arch/arm/mach-k3/r5/Makefile b/arch/arm/mach-k3/r5/Makefile index d3886caa064..f533c5e7743 100644 --- a/arch/arm/mach-k3/r5/Makefile +++ b/arch/arm/mach-k3/r5/Makefile @@ -16,6 +16,6 @@ obj-y += common.o obj-y += lowlevel_init.o obj-y += r5_mpu.o -ifeq ($(CONFIG_SPL_BUILD),y) +ifeq ($(CONFIG_XPL_BUILD),y) obj-$(CONFIG_K3_LOAD_SYSFW) += sysfw-loader.o endif diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c index 7c46914d9dd..3468a370a45 100644 --- a/arch/arm/mach-k3/security.c +++ b/arch/arm/mach-k3/security.c @@ -126,7 +126,7 @@ void ti_secure_image_post_process(void **p_image, size_t *p_size) * via YMODEM. This is done to avoid disturbing the YMODEM serial * protocol transactions. */ - if (!(IS_ENABLED(CONFIG_SPL_BUILD) && + if (!(IS_ENABLED(CONFIG_XPL_BUILD) && IS_ENABLED(CONFIG_SPL_YMODEM_SUPPORT) && spl_boot_device() == BOOT_DEVICE_UART)) printf("Authentication passed\n"); |