evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: davinci: enable da8xx build concurrently with older devices

Browse source 
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>
This commit is contained in:
Sekhar Nori 2014-02-25 17:27:55 +05:30
parent 6d0abeca32
commit 6ba9caaf47
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/configs/davinci_all_defconfig
View file

@ -34,6 +34,7 @@ CONFIG_AEABI=y
CONFIG_LEDS=y CONFIG_LEDS=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_AUTO_ZRELADDR=y
CONFIG_PM_RUNTIME=y CONFIG_PM_RUNTIME=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y

20
arch/arm/mach-davinci/Makefile.boot
View file

@ -1,13 +1,7 @@
ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y) zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX) += 0xc0008000
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y) params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX) := 0xc0000100
$(error Cannot enable DaVinci and DA8XX platforms concurrently) initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX) := 0xc0800000
else
zreladdr-y += 0xc0008000 zreladdr-$(CONFIG_ARCH_DAVINCI_DMx) += 0x80008000
params_phys-y := 0xc0000100 params_phys-$(CONFIG_ARCH_DAVINCI_DMx) := 0x80000100
initrd_phys-y := 0xc0800000 initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx) := 0x80800000
endif
else
zreladdr-y += 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000
endif