diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-24 09:04:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-24 09:04:23 -0400 |
| commit | 3fbd2dce351ab5d40d3244f26bd713caa4f826e2 (patch) | |
| tree | 4a8e5c2fd2dee4abed674da4ce0312af06f97bc1 /arch/arm/cpu/armv8/Makefile | |
| parent | 8a94262435ca559a5e2dad79f2dc3c130e9047a8 (diff) | |
| parent | 74a7e0018a97a0e7318c4c7a3b473fd9ebbb5ad1 (diff) | |
Merge branch '2019-04-22-master-imports'
- Add and enable brcmnand driver on a number of relevant platforms.
Also add and enable LED drivers on more bcm platforms.
- Various ARMv8 fixes/improvements, including extending PSCI
functionality.
- fs_loader improvments
- Various FIT/SPL improvements
- PCI bugfixes
- Poplar platform ethernet support
- MediaTek MMC improvements
- Android boot improvements
Diffstat (limited to 'arch/arm/cpu/armv8/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv8/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index a5f54330e3..b349b13f49 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -19,7 +19,9 @@ endif obj-y += cache.o obj-y += tlb.o obj-y += transition.o +ifndef CONFIG_ARMV8_PSCI obj-y += fwcall.o +endif obj-y += cpu-dt.o obj-$(CONFIG_ARM_SMCCC) += smccc-call.o |