diff options
| author | Tom Rini <trini@ti.com> | 2013-10-04 13:17:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-04 13:17:48 -0400 |
| commit | f835c77fb7e57508ffe8d8ca3a092ee28add77b2 (patch) | |
| tree | c3cecbfc7fa6adc834c6d2a365bb4e571a388b49 /arch/arm/cpu/armv7/Makefile | |
| parent | 0c5274e6f3231a3a28dafc1204b3f71a3534c520 (diff) | |
| parent | e261c83aa04ce0396d57aaecf8dfe0970ffac03e (diff) | |
| download | u-boot-imx-f835c77fb7e57508ffe8d8ca3a092ee28add77b2.zip u-boot-imx-f835c77fb7e57508ffe8d8ca3a092ee28add77b2.tar.gz u-boot-imx-f835c77fb7e57508ffe8d8ca3a092ee28add77b2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index b723e22..ee4b021 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -20,6 +20,11 @@ ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CON SOBJS += lowlevel_init.o endif +ifneq ($(CONFIG_ARMV7_NONSEC)$(CONFIG_ARMV7_VIRT),) +SOBJS += nonsec_virt.o +COBJS += virt-v7.o +endif + SRCS := $(START:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) START := $(addprefix $(obj),$(START)) |