From patchwork Thu Feb 18 14:01:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102746 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp605136lbl; Thu, 18 Feb 2016 06:04:30 -0800 (PST) X-Received: by 10.66.119.202 with SMTP id kw10mr5271647pab.110.1455804270075; Thu, 18 Feb 2016 06:04:30 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk7si9647820pac.50.2016.02.18.06.04.29; Thu, 18 Feb 2016 06:04:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946328AbcBROEZ (ORCPT + 30 others); Thu, 18 Feb 2016 09:04:25 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:55311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946181AbcBROEV (ORCPT ); Thu, 18 Feb 2016 09:04:21 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LfzrP-1aCmhJ382t-00pbTo; Thu, 18 Feb 2016 15:03:50 +0100 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Ard Biesheuvel , Nicolas Pitre , Jon Medhurst , Marc Zyngier , linux-kernel@vger.kernel.org Subject: [PATCH 4/9] ARM: add CONFIG_PHYS_OFFSET default values Date: Thu, 18 Feb 2016 15:01:56 +0100 Message-Id: <1455804123-2526139-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455804123-2526139-1-git-send-email-arnd@arndb.de> References: <1455804123-2526139-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:UcZoG2SRS0NasKo0oOjRKzl2hEhaVPjw2bj1P5Mn+DZ3cdFl74b T/rtNAMnZ8gpiq7Mmeiw2k6KWCVOZ7MuV0vqApqOtOKWFIuzEri2zAvHnFEgJHALk0exW6T Cm7DwcNN1gy3u/U8pE6VJAy7CDhnbZzHHF/4heScBOs3KqYLK6kMm1yA8UlhfNyyBUu0nqh yEGhy2JboI2UBULEqyHKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:TySHnPNcSFI=:7GAyfjnLHYDxNzU5KtRutn hlwtjFeBspxAVIvihOksfOdIZUA6n+YhZ0CebOBlmpM7ANqBHvv+7R750AXAjKTsdSTguC0Yl KimuJyMotgnINGLAyNPdsWpTgh73UmDEclesYSKf01GRvxdkTtp9VAA5fFLv41vjhQbdUbWL/ Y31UIFyf7BIsX3uQEQy/akLw+JyvaS3T74AM4W0kEVmAUHtGwHgMEvh5dnbi9UF9+v0g69oHW 9bdp2uXMgyvte2DiypAnbDEhKgEukqxopcXGY5XYs0Buk78xH3varA2sG5gV4jJCeZcySZZrO Z/+k7zMX3f6cg4vjtUynWD3s6gGSKPbvKnmiKGuFI2/hJdekXAW3TEdaXv04HCTD/K/FEwr/2 2qG09sKRw2zodMgFDML2zEHc32uAIGnOQqmeJ0m1qlh0/bflaCPfgmjbxMF/a7cngy/Y+EqHm hGLIvut4vE50Uc4XRkor4syqaa9gwRcQDyThRyJIP+1plUAF1y6qtf0orvJxjbMkvMY3ojs6/ oyXKU0Qkva8dvTcTfTwlGlioPbhE0M0t1Q49sRGHc0xV6NFkrcwwqMMRMTSO3enZTx8MguaP7 QiRgtqlurbUqhE6guqZkDm6xyuHLNYqaF3LdsgU4lNW0SPW8J4eRLGY7hO4ZQGIWnfPGLjqgR vN2CJdjH1CdAo+7t30Now6sv7vtiJmnOjLbxXwwPJS+NAodLl9Fmzz0vzhM7x5boWsR0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For platforms that are not yet converted to ARCH_MULTIPLATFORM, we can disable CONFIG_ARM_PATCH_PHYS_VIRT, which in turn requires setting a correct address here. As we actualy know what all the values are supposed to be based on the old mach/memory.h header file contents (from git history), we can just add them here. This also solves a problem in Kconfig where 'make randconfig' fails to continue if no number is selected for a 'hex' option. Users can still override the number at configuration time, e.g. when the memory visible to the kernel starts at a nonstandard address on some machine, but it should no longer be required now. To make this foolproof, another patch is required in mach-davinci to prevent a configuration with both DMx and DA8xx enabled but ARM_PATCH_PHYS_VIRT disabled. The two patches however can be merged independently as there is no direct dependency between them. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index be00b53f399b..7839c9923709 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -271,15 +271,29 @@ config PHYS_OFFSET depends on !ARM_PATCH_PHYS_VIRT default DRAM_BASE if !MMU default 0x00000000 if ARCH_EBSA110 || \ + ARCH_DOVE || \ ARCH_FOOTBRIDGE || \ + (ARCH_GEMINI && GEMINI_MEM_SWAP) || \ ARCH_INTEGRATOR || \ + ARCH_IOP33X || \ ARCH_IOP13XX || \ + ARCH_IXP4XX || \ ARCH_KS8695 || \ - (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET) - default 0x10000000 if ARCH_OMAP1 || ARCH_RPC + (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET) || \ + ARCH_W90X900 + default 0x10000000 if (ARCH_GEMINI && !GEMINI_MEM_SWAP) || \ + ARCH_OMAP1 || \ + ARCH_RPC default 0x20000000 if ARCH_S5PV210 + default 0x30000000 if ARCH_S3C24XX default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET - default 0xc0000000 if ARCH_SA1100 + default 0x80000000 if (ARCH_DAVINCI_DMx && !ARCH_DAVINCI_DA8XX) || \ + ARCH_NETX || \ + ARCH_LPC32XX + default 0xa0000000 if ARCH_IOP32X || ARCH_PXA + default 0xc0000000 if (ARCH_DAVINCI_DA8XX && !ARCH_DAVINCI_DMx) || \ + ARCH_CLPS711X || \ + ARCH_SA1100 help Please provide the physical address corresponding to the location of main memory in your system.