From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 12 Dec 2014 23:11:29 +0100 (CET) Received: from mail-pa0-f48.google.com ([209.85.220.48]:51798 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27008605AbaLLWIkLhfWG (ORCPT ); Fri, 12 Dec 2014 23:08:40 +0100 Received: by mail-pa0-f48.google.com with SMTP id rd3so8027348pab.21 for ; Fri, 12 Dec 2014 14:08:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I5BDtdBCdTK829Hmg8mCOxicI0RuG814zy8DNpw3ifI=; b=I6FQvP2Ge2JjVQiRQTzBXH46vAMU9KJ291ZYv2Slbk4krlq0e1q8Mz9sQGh8fWsWV5 Oyd47p5Akh5cUSe0EwXs4UnyxtjqA2+VXNJn6B/qnn2akjVrejdMwysmBjo+seU6f6mH Cb8z2+a3ILWQvD1xzbw3X5vp2y0o4NrApi6xJQGBM5/MrUCJJXsedqtFcgWgfYAxzbk8 H0OZ2jqqGq6UnrIU8NtkynfYjH483wvi5kgSKjBdn1ujMBIdKh0X7+DxM4c9qPcz/0/3 ZjPNeLFgZpjQdpnX+0hRlOtwGGWHoQb6fiqm7w+5sK9HScSBeYczRBG6Xy7afvatTm8V oiRw== X-Received: by 10.66.169.209 with SMTP id ag17mr30180010pac.62.1418422114140; Fri, 12 Dec 2014 14:08:34 -0800 (PST) Received: from localhost (b32.net. [192.81.132.72]) by mx.google.com with ESMTPSA id tm3sm2425841pac.12.2014.12.12.14.08.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Dec 2014 14:08:33 -0800 (PST) From: Kevin Cernekee To: ralf@linux-mips.org Cc: f.fainelli@gmail.com, tglx@linutronix.de, jason@lakedaemon.net, jogo@openwrt.org, arnd@arndb.de, computersforpeace@gmail.com, linux-mips@linux-mips.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V5 12/23] MIPS: Reorder MIPS_L1_CACHE_SHIFT priorities Date: Fri, 12 Dec 2014 14:07:03 -0800 Message-Id: <1418422034-17099-13-git-send-email-cernekee@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1418422034-17099-1-git-send-email-cernekee@gmail.com> References: <1418422034-17099-1-git-send-email-cernekee@gmail.com> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 44649 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: cernekee@gmail.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Enabling support for more than one BMIPS CPU in the same build may result in different L1_CACHE_SHIFT values, e.g. CPU_BMIPS5000 selects MIPS_L1_CACHE_SHIFT_7 CPU_BMIPS4380 selects MIPS_L1_CACHE_SHIFT_6 anything else defaults to MIPS_L1_CACHE_SHIFT_5 Ensure that if more than one MIPS_L1_CACHE_SHIFT_x option is selected, Kconfig sets CONFIG_MIPS_L1_CACHE_SHIFT to the highest value. Signed-off-by: Kevin Cernekee --- arch/mips/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 31bbec0..d28c29e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1193,10 +1193,10 @@ config MIPS_L1_CACHE_SHIFT_7 config MIPS_L1_CACHE_SHIFT int - default "4" if MIPS_L1_CACHE_SHIFT_4 - default "5" if MIPS_L1_CACHE_SHIFT_5 - default "6" if MIPS_L1_CACHE_SHIFT_6 default "7" if MIPS_L1_CACHE_SHIFT_7 + default "6" if MIPS_L1_CACHE_SHIFT_6 + default "5" if MIPS_L1_CACHE_SHIFT_5 + default "4" if MIPS_L1_CACHE_SHIFT_4 default "5" config HAVE_STD_PC_SERIAL_PORT -- 2.1.1