Merge remote-tracking branch 'asoc/topic/component' into asoc-next

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / Makefile.boot

diff --git a/arch/arm/mach-davinci/Makefile.boot b/arch/arm/mach-davinci/Makefile.boot
index 5c5a95a9d7d2b17c716ebc06e96ea31c529046c8..d36b251f325ba98184f4a0cfa8f8308cf8fd078a 100644 (file)
--- a/arch/arm/mach-davinci/Makefile.boot
+++ b/arch/arm/mach-davinci/Makefile.boot
@@ -1,15 +1,8 @@
-ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
-ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
-$(error Cannot enable DaVinci and DA8XX platforms concurrently)
-else
-   zreladdr-y  += 0xc0008000
-params_phys-y  := 0xc0000100
-initrd_phys-y  := 0xc0800000
-endif
-else
-   zreladdr-y  += 0x80008000
-params_phys-y  := 0x80000100
-initrd_phys-y  := 0x80800000
-endif
+# SPDX-License-Identifier: GPL-2.0
+zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX)          += 0xc0008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)       := 0xc0000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)       := 0xc0800000
 
-dtb-$(CONFIG_MACH_DA8XX_DT)    += da850-enbw-cmc.dtb da850-evm.dtb
+zreladdr-$(CONFIG_ARCH_DAVINCI_DMx)            += 0x80008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DMx)         := 0x80000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx)         := 0x80800000