From patchwork Fri May 12 11:26:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 761555 X-Patchwork-Delegate: daniel.schwierzeck@googlemail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wPSNX0xt0z9s7j for ; Fri, 12 May 2017 21:26:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xujs5Ecn"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id D8DE6C21D09; Fri, 12 May 2017 11:26:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D4F1DC21D04; Fri, 12 May 2017 11:26:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3DC0EC21D04; Fri, 12 May 2017 11:26:26 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id D01C6C21D01 for ; Fri, 12 May 2017 11:26:25 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id d127so13273330wmf.1 for ; Fri, 12 May 2017 04:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rw44uCwchmvIZHTIsQQ9qt6mFuM5xGJpOj8ZhzKzxaI=; b=Xujs5EcnjwcID11b3HF3RLryO8c0vWhoQArOYHN8RKmMQMs1ja+GpRT1G7WbmPfyzs m4n4FBaKYqeNceKLXFvLa6tPW41VW/SqUWg3XoBQKRsP9pFqEh8tqBtCi0xAZZiQXnWm yRY/V7Zb+/T/y0kP/fX2EkEYqQykHGiAX6GU72nnKVlp2zuATC1y4ja75F+/DcnA1mbS PyJDQB1/KFPxvZk5KtzXJ5/dD7zJ8By5ORSrH1ZpoZVpSObk6rlVqN/acyK00AydCU20 N61IexTb8JUAAz0o0pwtjN/43RP+or8JpwMkPldMJN890k8rp9pDjBNFMqAZLytKi1gM 5dnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rw44uCwchmvIZHTIsQQ9qt6mFuM5xGJpOj8ZhzKzxaI=; b=YU0me0N1R4/dWdtgmezideiLgEMYf1nuxgGZQHA7N7xxutMtilf4fWksZ+eMeHvUDt Nqv7i8CsEP6Tf3s59MWOmZG2HS2K/n84Vl4r56TcnELSmC9+nntalnXj/jb2RmNzHRUp huAj7D6DMF1gwwaWo3yTrDc7/Zs7YDunSy6x1wY2zYVKCPZ0nAmfXVbfklthQpzPe8oR nCoA2S0/ZqW9tiLXwMXHyNhRGYxHWMo3b+Z00c/exSok8y4BQa0cr/mQbkNVxO89tkUA c7Y+09aWyOhtGtkDEAJHOGd9t0oR0zAKxVJmoTWD8Cf0WMYG0xLZNN4qk9MOtugjT1+t ae3Q== X-Gm-Message-State: AODbwcDlz2uxfR476qSjljPymujwdNALUubxccVY/utj51TcLUiHUKzE VAxGVUTOPmdtQA== X-Received: by 10.28.207.207 with SMTP id f198mr2320011wmg.85.1494588385421; Fri, 12 May 2017 04:26:25 -0700 (PDT) Received: from workstation.zombienet.local (p2003005F2C29C10068669ED6453BE4CC.dip0.t-ipconnect.de. [2003:5f:2c29:c100:6866:9ed6:453b:e4cc]) by smtp.gmail.com with ESMTPSA id y63sm2861284wme.31.2017.05.12.04.26.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 May 2017 04:26:22 -0700 (PDT) From: Daniel Schwierzeck To: u-boot@lists.denx.de Date: Fri, 12 May 2017 13:26:11 +0200 Message-Id: <20170512112611.9164-1-daniel.schwierzeck@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170430192244.9623-3-daniel.schwierzeck@gmail.com> References: <20170430192244.9623-3-daniel.schwierzeck@gmail.com> Subject: [U-Boot] [RESEND PATCH v3 1/5] MIPS: Make CM GCR base configurable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Paul Burton Without adding a prompt for CONFIG_MIPS_CM_BASE, Kconfig doesn't allow defconfigs to set it. Provide the prompt in order to allow for that. Signed-off-by: Paul Burton Signed-off-by: Daniel Schwierzeck Reviewed-by: Simon Glass --- Changes in v3: - fix build error if CONFIG_MIPS_CM is not selected Changes in v2: - move to menu "General setup" arch/mips/Kconfig | 19 ++++++++++--------- arch/mips/lib/cache.c | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c97ea4156b..77d1ac65d2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -221,6 +221,16 @@ config ROM_EXCEPTION_VECTORS Disable this, if the U-Boot image is booted from DRAM (e.g. by SPL). In that case the image size will be reduced by 0x500 bytes. +config MIPS_CM_BASE + hex "MIPS CM GCR Base Address" + depends on MIPS_CM + default 0x1fbf8000 + help + The physical base address at which to map the MIPS Coherence Manager + Global Configuration Registers (GCRs). This should be set such that + the GCRs occupy a region of the physical address space which is + otherwise unused, or at minimum that software doesn't need to access. + endmenu menu "OS boot interface" @@ -393,15 +403,6 @@ config MIPS_CM wish U-Boot to configure it or make use of it to retrieve system information such as cache configuration. -config MIPS_CM_BASE - hex - default 0x1fbf8000 - help - The physical base address at which to map the MIPS Coherence Manager - Global Configuration Registers (GCRs). This should be set such that - the GCRs occupy a region of the physical address space which is - otherwise unused, or at minimum that software doesn't need to access. - endif endmenu diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index bd14ba6ea7..91b037f87d 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -7,7 +7,9 @@ #include #include +#ifdef CONFIG_MIPS_L2_CACHE #include +#endif #include DECLARE_GLOBAL_DATA_PTR;