Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba9caaf authored by Sekhar Nori's avatar Sekhar Nori
Browse files

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: default avatarSekhar Nori <nsekhar@ti.com>
parent 6d0abeca

arch/arm/configs/davinci_all_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-davinci/Makefile.boot

+7 −13
Original line number Diff line number Diff line 
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