From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753593AbbKYQcl (ORCPT ); Wed, 25 Nov 2015 11:32:41 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:61973 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752294AbbKYQci (ORCPT ); Wed, 25 Nov 2015 11:32:38 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Linus Walleij , Russell King , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Arnd Bergmann , Russell King Subject: [PATCH 08/10] ARM: no longer make CPU targets visible separately Date: Wed, 25 Nov 2015 17:32:21 +0100 Message-Id: <1448469143-447355-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1448469143-447355-1-git-send-email-arnd@arndb.de> References: <1448469143-447355-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:juBKMg8JZ8f9BCyCaOtmbksXc+QuMYYJfd2m1JnnCw/qCcizQnk V9XWyJN7Mc8ZwUX/lLiMSC3o4+wMsO4YbqSU+jlpM1MtIAnZ+EK3bWyAn87pkaTmoYcDTAv DEaJSNsKOBdTazSKJ1+D03d4qQUno/GQmlGboBgNFBQOsuRPcTVPqilgYP4VpS8lmzpJbyV bcjtXhHBMBOHVp9jxrQTg== X-UI-Out-Filterresults: notjunk:1;V01:K0:u+o92sF0fAA=:7mSsD2HfXKlNLcXY/2BFQ9 1ZOI/hDBGssZXXd4iQjgW9uSndMV5cQLoaCUG7gGgpOZlhQYjxcQZy6RWyWbtQ65V3Jq0aSLQ UxMeuAUKO9L0WgTDsIWyOwR1ozAFoOHLgp7JNB4QxtIp6CuaJJ3eW9Y+s+Vdf4jrGw1iyUPTA 79gBpa9QGk0f4zwr3vIdFf/fHxLqLKHD5oL+i0a2w2jgoNE6RuJGtjlokVJ517a82VupI1wul g+5nWnCE5eOJGZ32LABS2FH1mSFjEH7u3yM0gcltQTztVscw1k2yqjjJzdJMiIoWlC6LXIt3/ 9BCiXzhoeaSlqcuLZVrw6A5iwRRq0iKFwppOwiwFAS4uqbBqtoGBkk2zPgXeKpD26d8GfQdoY Z6D8Awdnle6HSlsdT7ha/6oO/iztqHHiK9a6XvSvEs8qduFh9IXLuSYRnM/3BzkQE3qGaAPIr 50P0JZBuVjmWZ7lCH5M8ECNNwbJsTw3bnAKN1l6Oe4m+3zgRmG/y5KQT9jTbpHFMIf+iPuXsJ i19oCtcrspDBDFNZlFI1RL9sJyDAYhJi3r/jwQ5u+OToJnDoP1/yc01yWzofORBz1LOmxvl2D MYtdcBIPhfRMHRVeceVjmxF0LPBwhGzi/AOXlkBg9e6uH1LRsnW6CiW9fTYP2w4rpt7gpZtlC G/PDj7pmDm4runinfkD3dJX7QDt/JP3A+1GDKnFh+rOKuSWR8sWGbXqsR3KtApKOb+Qo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that realview and integrator always select the correct CPU type themselves based on the core tiles, there is no need to still have them user-visible in arch/arm/mm/Kconfig. The ARM925T symbol has been selected by the only user for many years, so that can be removed along with the realview and integrator specific ones. This also solves randconfig build problems on realview. Signed-off-by: Arnd Bergmann Acked-by: Linus Walleij Cc: Russell King --- arch/arm/mm/Kconfig | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 76f65f2d59b1..549f6d3aec5b 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -21,7 +21,7 @@ config CPU_ARM7TDMI # ARM720T config CPU_ARM720T - bool "Support ARM720T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR) + bool select CPU_32v4T select CPU_ABRT_LV4T select CPU_CACHE_V4 @@ -39,7 +39,7 @@ config CPU_ARM720T # ARM740T config CPU_ARM740T - bool "Support ARM740T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR) + bool depends on !MMU select CPU_32v4T select CPU_ABRT_LV4T @@ -71,7 +71,7 @@ config CPU_ARM9TDMI # ARM920T config CPU_ARM920T - bool "Support ARM920T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR) + bool select CPU_32v4T select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -89,7 +89,7 @@ config CPU_ARM920T # ARM922T config CPU_ARM922T - bool "Support ARM922T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR) + bool select CPU_32v4T select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -108,7 +108,7 @@ config CPU_ARM922T # ARM925T config CPU_ARM925T - bool "Support ARM925T processor" if ARCH_OMAP1 + bool select CPU_32v4T select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -127,7 +127,7 @@ config CPU_ARM925T # ARM926T config CPU_ARM926T - bool "Support ARM926T processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V5) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB) + bool select CPU_32v5 select CPU_ABRT_EV5TJ select CPU_CACHE_VIVT @@ -163,7 +163,7 @@ config CPU_FA526 # ARM940T config CPU_ARM940T - bool "Support ARM940T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR) + bool depends on !MMU select CPU_32v4T select CPU_ABRT_NOMMU @@ -181,7 +181,7 @@ config CPU_ARM940T # ARM946E-S config CPU_ARM946E - bool "Support ARM946E-S processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR) + bool depends on !MMU select CPU_32v5 select CPU_ABRT_NOMMU @@ -198,7 +198,7 @@ config CPU_ARM946E # ARM1020 - needs validating config CPU_ARM1020 - bool "Support ARM1020T (rev 0) processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR) + bool select CPU_32v5 select CPU_ABRT_EV4T select CPU_CACHE_V4WT @@ -216,7 +216,7 @@ config CPU_ARM1020 # ARM1020E - needs validating config CPU_ARM1020E - bool "Support ARM1020E processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR) + bool depends on n select CPU_32v5 select CPU_ABRT_EV4T @@ -229,7 +229,7 @@ config CPU_ARM1020E # ARM1022E config CPU_ARM1022 - bool "Support ARM1022E processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR) + bool select CPU_32v5 select CPU_ABRT_EV4T select CPU_CACHE_VIVT @@ -247,7 +247,7 @@ config CPU_ARM1022 # ARM1026EJ-S config CPU_ARM1026 - bool "Support ARM1026EJ-S processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR) + bool select CPU_32v5 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 select CPU_CACHE_VIVT @@ -358,7 +358,7 @@ config CPU_PJ4B # ARMv6 config CPU_V6 - bool "Support ARM V6 processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V6) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX) + bool select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 @@ -371,7 +371,7 @@ config CPU_V6 # ARMv6k config CPU_V6K - bool "Support ARM V6K processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V6) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX) + bool select CPU_32v6 select CPU_32v6K select CPU_ABRT_EV6 @@ -385,7 +385,7 @@ config CPU_V6K # ARMv7 config CPU_V7 - bool "Support ARM V7 processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V7) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX) + bool select CPU_32v6K select CPU_32v7 select CPU_ABRT_EV7 -- 2.1.0.rc2