diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-29 09:26:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-29 09:26:11 -0400 |
| commit | 423e08cb77015beab6a81595765ec1faa34bedde (patch) | |
| tree | 268fb246e025b8a5fc4eddc3c207ef428f16eb68 /arch/arm/cpu/armv7/s5p-common/Makefile | |
| parent | 3b191c56c841596771b4120f09fb556adf958b5c (diff) | |
| parent | 3fad1ca28d4c87346d18b89438bf2084fb2c3896 (diff) | |
Merge branch '2020-07-28-misc-soc-improvements'
- Assorted MediaTek improvements
- s5p4418 support
- QEMU ARM platform improvements
- Qualcomm IPQ40xx support
Diffstat (limited to 'arch/arm/cpu/armv7/s5p-common/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/s5p-common/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index 12cf804e88..bfe02389cd 100644 --- a/arch/arm/cpu/armv7/s5p-common/Makefile +++ b/arch/arm/cpu/armv7/s5p-common/Makefile @@ -3,9 +3,14 @@ # Copyright (C) 2009 Samsung Electronics # Minkyu Kang <mk7.kang@samsung.com> -obj-y += cpu_info.o +ifdef CONFIG_ARCH_NEXELL +obj-$(CONFIG_PWM_NX) += pwm.o +obj-$(CONFIG_S5P4418_ONEWIRE) += pwm.o +else +obj-y += cpu_info.o ifndef CONFIG_SPL_BUILD -obj-y += timer.o -obj-y += sromc.o -obj-$(CONFIG_PWM) += pwm.o +obj-y += timer.o +obj-y += sromc.o +obj-$(CONFIG_PWM) += pwm.o +endif endif |