diff options
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/arm926ejs/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-at91/config.mk | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/clk.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index cbd0ed68c27..447cd80642c 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o -ifneq ($(CONFIG_SPL_BUILD),) +ifneq ($(CONFIG_XPL_BUILD),) obj-$(CONFIG_AT91SAM9260) += sdram.o spl_at91.o obj-$(CONFIG_AT91SAM9G20) += sdram.o spl_at91.o obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o diff --git a/arch/arm/mach-at91/arm926ejs/Makefile b/arch/arm/mach-at91/arm926ejs/Makefile index a8916862b3f..8f0bc5d997e 100644 --- a/arch/arm/mach-at91/arm926ejs/Makefile +++ b/arch/arm/mach-at91/arm926ejs/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_AT91SAM9X5) += at91sam9x5_devices.o obj-$(CONFIG_SAM9X60) += sam9x60_devices.o obj-y += clock.o obj-y += cpu.o -ifndef CONFIG_$(SPL_TPL_)SYSRESET +ifndef CONFIG_$(PHASE_)SYSRESET obj-y += reset.o endif ifneq ($(CONFIG_ATMEL_PIT_TIMER),y) @@ -32,7 +32,7 @@ obj-y += lowlevel_init.o endif endif -ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD +ifdef CONFIG_$(XPL_)SYS_THUMB_BUILD ifndef CONFIG_HAS_THUMB2 CFLAGS_cache.o := -marm diff --git a/arch/arm/mach-at91/config.mk b/arch/arm/mach-at91/config.mk index 5426394651e..a31612b8179 100644 --- a/arch/arm/mach-at91/config.mk +++ b/arch/arm/mach-at91/config.mk @@ -3,7 +3,7 @@ PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,) endif ifeq ($(CONFIG_CPU_V7A),y) -ifndef CONFIG_SPL_BUILD +ifndef CONFIG_XPL_BUILD INPUTS-y += u-boot.img endif endif diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index c1d92739e47..09b8f0586c6 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/at91_pmc.h> #include <asm/global_data.h> +#include <asm/io.h> #define GCK_CSS_SLOW_CLK 0 #define GCK_CSS_MAIN_CLK 1 |