From patchwork Wed Aug 10 07:08:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 657626 X-Patchwork-Delegate: yamada.m@jp.panasonic.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3s8N9m4GVpz9svs for ; Wed, 10 Aug 2016 17:31:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b=fuKJVcQG; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E858FA7524; Wed, 10 Aug 2016 09:31:06 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qa79IsvCED8G; Wed, 10 Aug 2016 09:31:06 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 484904B97D; Wed, 10 Aug 2016 09:20:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0C7CA4BA16 for ; Wed, 10 Aug 2016 09:07:42 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iDi5PdU2Lmbn for ; Wed, 10 Aug 2016 09:07:41 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by theia.denx.de (Postfix) with ESMTPS id B83214B97D for ; Wed, 10 Aug 2016 09:07:20 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id u7A76xSv005792; Wed, 10 Aug 2016 16:07:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u7A76xSv005792 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1470812824; bh=iJoR9WSw72i3mSWeru1q6cxyMadiazcQUudYhHvxTs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fuKJVcQGda5Hf2Xhq4/UaBFS3oJCBOM6l2dhdjWIzovSkhyeZOQBAx9tOoNpPzsiP ejEoGbMMddavwncdCBIuu4//C27xpObvwp8tGkhKPZwV0tZ5TphL3kifF1Hmt29eVj BxwNuD5t+F9jH9jnVTCud52n0Go7X85xS+ROF0Kv/Vq4KWlSRMl1Bx/CazcIGvxT96 imTCH+NLRvIfEa1YXAnwPwb30SVOL/vlozbq38ycrlZUTtKWyKDwiV1Lvrr2otbMf9 hy7kAR1Xkl30ZLFSHdtKmAU3hCyvEDF7Nt2DJ8lVRFQUKRMw0tGW2AxiYzcNjQmjqj xU9zWQO6i429A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 10 Aug 2016 16:08:45 +0900 Message-Id: <1470812929-21178-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470812929-21178-1-git-send-email-yamada.masahiro@socionext.com> References: <1470812929-21178-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 10/14] ARM: uniphier: move (and rename) CONFIG_UNIPHIER_L2CACHE_ON to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Move this option to Kconfig, renaming it into CONFIG_CACHE_UNIPHIER. The new option name makes sense enough, and the same as Linux has. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/Kconfig | 7 +++++++ arch/arm/mach-uniphier/arm32/cache-uniphier.c | 2 +- include/configs/uniphier.h | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index e39ced6..a558073 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -70,6 +70,13 @@ config ARCH_UNIPHIER_LD6B depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B default y +config CACHE_UNIPHIER + bool "Enable the UniPhier L2 cache controller" + depends on ARCH_UNIPHIER_32BIT + default y + help + This option allows to use the UniPhier System Cache as L2 cache. + config MICRO_SUPPORT_CARD bool "Use Micro Support Card" help diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index 77a0b78..da9488e 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -206,7 +206,7 @@ void uniphier_cache_disable(void) uniphier_cache_endisable(0); } -#ifdef CONFIG_UNIPHIER_L2CACHE_ON +#ifdef CONFIG_CACHE_UNIPHIER void v7_outer_cache_flush_all(void) { uniphier_cache_maint_all(UNIPHIER_SSCOQM_CM_FLUSH); diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index e485583..2606e53 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_CACHELINE_SIZE 32 -/* Comment out the following to disable L2 cache */ -#define CONFIG_UNIPHIER_L2CACHE_ON - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_MISC_INIT_F