Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752647AbbBLTnZ (ORCPT ); Thu, 12 Feb 2015 14:43:25 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:49364 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751468AbbBLTnW (ORCPT ); Thu, 12 Feb 2015 14:43:22 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Sekhar Nori , Kevin Hilman Subject: [PATCH 05/11] ARM: davinci: multi-soc kernels require AUTO_ZRELADDR Date: Thu, 12 Feb 2015 20:42:37 +0100 Message-Id: <1423770163-583064-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1423770163-583064-1-git-send-email-arnd@arndb.de> References: <1423770163-583064-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:WNzj+scgZswq1FsbFiqjTCjJAOwsNW0ix6fUgMBF8JYLJ8adEgY CryYFjpoW6Oc3r9izg6gnlN9oVsqPGbNF9ZYZaDZItwUvkww2Dow0imA3IIPu3mZLFoWr+K c4WLf5ZwPzpIactC5OfiJnvz69lXRxdtkpx/AdT8b2dK7WRxB2n7lH5mTEGOboIc0YLi4oz Q41pc+eCPFYb19NvWnkIA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1446 Lines: 44 The davinci DA8xx and DMx families have incompatible zreladdr settings, and attempting to build a kernel with both enabled results in an error unless AUTO_ZRELADDR is set: multiple zreladdrs: 0xc0008000 0x80008000 This needs CONFIG_AUTO_ZRELADDR to be set This patch changes Kconfig to make the two families mutually exclusive when this is unset. Signed-off-by: Arnd Bergmann Cc: Sekhar Nori Cc: Kevin Hilman --- arch/arm/mach-davinci/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 584e8d4e2892..cd30f6f5f2ff 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -32,12 +32,14 @@ config ARCH_DAVINCI_DM646x config ARCH_DAVINCI_DA830 bool "DA830/OMAP-L137/AM17x based system" + depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR select ARCH_DAVINCI_DA8XX select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1 select CP_INTC config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" + depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR select ARCH_DAVINCI_DA8XX select CP_INTC -- 2.1.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/