ARM: davinci: enable da8xx build concurrently with older devices

Enable da8xx devices to build concurrently with older
(traditional) DaVinci devices. Do this by defining multiple
zreladdr values and enabling AUTO_ZRELADDR to prevent
build regressions. Note that we do not enable AUTO_ZRELADDR in
da8xx_omapl_defconfig since it is meant to be removed.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index ab2f737..8a8379a 100644 (file)
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -34,6 +34,7 @@ CONFIG_AEABI=y
 CONFIG_LEDS=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_AUTO_ZRELADDR=y
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y

diff --git a/arch/arm/mach-davinci/Makefile.boot b/arch/arm/mach-davinci/Makefile.boot
index 04a6c4e..4b81601 100644 (file)
--- a/arch/arm/mach-davinci/Makefile.boot
+++ b/arch/arm/mach-davinci/Makefile.boot
@@ -1,13 +1,7 @@
-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
+zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX)          += 0xc0008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)       := 0xc0000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)       := 0xc0800000
+
+zreladdr-$(CONFIG_ARCH_DAVINCI_DMx)            += 0x80008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DMx)         := 0x80000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx)         := 0x80800000