diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-22 18:15:16 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 19:20:28 (GMT) |
| commit | 711391131c84398d1b8256ab5a8cfa2969ad57c7 (patch) | |
| tree | 0abea0dbe3971e5420557828a145275bb07bd9f9 /arch/arm/lib/Makefile | |
| parent | a4b0d83b66f1cef9a93b403e4c11424b5b43b09f (diff) | |
| parent | 80b51b5aa91b75d83323fd1fdd253d5f67621784 (diff) | |
| download | u-boot-711391131c84398d1b8256ab5a8cfa2969ad57c7.tar.xz | |
Merge git://git.denx.de/u-boot-sunxi
trini: Make Kconfig SPL_xxx entires only show if SPL, so that we don't
get Kconfig errors on platforms without SPL, ie sandbox (without SPL).
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/lib/Makefile')
| -rw-r--r-- | arch/arm/lib/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 53d4ed2..f162c14 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -44,8 +44,10 @@ obj-y += stack.o ifdef CONFIG_CPU_V7M obj-y += interrupts_m.o else ifdef CONFIG_ARM64 -obj-y += ccn504.o +obj-$(CONFIG_FSL_LAYERSCAPE) += ccn504.o +ifneq ($(CONFIG_GICV2)$(CONFIG_GICV3),) obj-y += gic_64.o +endif obj-y += interrupts_64.o else obj-y += interrupts.o |