From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753855AbcBAUgi (ORCPT ); Mon, 1 Feb 2016 15:36:38 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:56000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753740AbcBAUgh (ORCPT ); Mon, 1 Feb 2016 15:36:37 -0500 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] ARM: davinci: DA8xx+DMx combined kernels need PATCH_PHYS_VIRT Date: Mon, 1 Feb 2016 21:35:57 +0100 Message-Id: <1454358962-640598-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454358962-640598-1-git-send-email-arnd@arndb.de> References: <1454358962-640598-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:WIRCFlHkvToG1YwtbwVKgwgGX80LkAQ47KlsUHItfZ8FNWkKuH2 RT/cdGD3etNwZsI+LTOWJ4gwyZN8zKBtvTECFLS02QMOZ2jPbhG1k5ockhRuuAkzjV7L5JN trOK/EcPukJwOmmDI+WmShwqki9pFX2fpAoFZOhXBZC/gKNPrf6jct/g4sc4EXnaqomY9xV aXxUnVeVVIGG7WlWGDwBw== X-UI-Out-Filterresults: notjunk:1;V01:K0:6AIOYITCLcE=:TsFEyVJaikvdtUOz0q8HvT xSItl0A8bjte4bCfdoqd6J/UkpU665I76+ldIYeWAOVSZnD1PjRdCoQzsjI6qggqu1tyhISvM ih7Fo9BchfRkBGoRXGpV2p2vSXls9lP2BYiaV3iJTDsrzqIl5hiyvJN5FWxa8juwCuijnvO+2 OCZQhz7Dw/EuvNvD/6k6/x7Cp8k1ZfVcrDH5tR3eusubJlPHuzC95Xho6pP8QoLl7633zl6MH FTb8kTmMINRsrIIGdVrZ4kIrOQVBCppOT3sQMryUWma97OeCVOMTmooMYU7zoTNo36nMQklEh NJSa6+ndoO6vHYe5tUhLkXBurV+0f3fBFVISrKDZ6NDhlqTgX2jyLE8aeNnhB99w00cZeqJ9+ QSFeZIftLlj74FjuYepvbWN19wOuUsB6aaU95lYSq/FZpcMqcUntlHjY1WHzE4bAUcrvkVPvr NYzT+JjuARfN/4hVw7bgj75Ett3Ji/ea560woaV3QkCIwN1ySx9xOiar2IzTog8wmVMGVfd/0 +yec3nqh2ukHUCrEp5KseUV/9D0mYrYniAzFTD2Je27SZ0U3t05OEMmVH4aiaDTKfV5/uVIwY wyF+XbZew2SMSomZ6mJjiZlGCUCmAXfkE7wI1rzFEpxiPRnk2NBnv9C04TJOxczuL1eQjWQD3 pNTsBD1bzn0C32RskcNgYYnXku4wdtwRvBRYk8O42YaR1c/EEq+gjOtWdY/NMqk0avis= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We already forbid that combination when AUTO_ZRELADDR is disabled, for the same reason that the two have their RAM at different physical addresses as seen from the CPU. This does the same change for PATCH_PHYS_VIRT: if you disable either of the options, Kconfig now enforces that you have to pick one or the other SoC family. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 1 + arch/arm/mach-davinci/Kconfig | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21d79b2531cc..8b10ccf4077e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -612,6 +612,7 @@ config ARCH_DAVINCI select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select CPU_ARM926T select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 6124c69154c3..8f54be83ec15 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -9,7 +9,6 @@ config CP_INTC config ARCH_DAVINCI_DMx bool - select CPU_ARM926T menu "TI DaVinci Implementations" @@ -32,7 +31,7 @@ config ARCH_DAVINCI_DM646x config ARCH_DAVINCI_DA830 bool "DA830/OMAP-L137/AM17x based system" - depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR + depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE @@ -40,13 +39,12 @@ config ARCH_DAVINCI_DA830 config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" - depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR + depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX select CP_INTC config ARCH_DAVINCI_DA8XX bool - select CPU_ARM926T config ARCH_DAVINCI_DM365 bool "DaVinci 365 based system" -- 2.7.0