From patchwork Wed Aug 8 21:27:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1297891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 64DAA3FCFC for ; Wed, 8 Aug 2012 21:32:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SzDoK-0000Bf-Ca; Wed, 08 Aug 2012 21:29:00 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SzDnd-00005s-V8 for linux-arm-kernel@lists.infradead.org; Wed, 08 Aug 2012 21:28:19 +0000 Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LkUcJ-1TaCNE40uR-00c5yQ; Wed, 08 Aug 2012 23:28:12 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] ARM: rpc: Fix building RiscPC Date: Wed, 8 Aug 2012 23:27:57 +0200 Message-Id: <1344461278-28245-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1344461278-28245-1-git-send-email-arnd@arndb.de> References: <1344461278-28245-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:NaK+FXj1uuldGtfArWQHyolwDLs+Stbv7HkO30D/9Lh 1W+1qlkMUI1QG0J/ABrUii+HdKick26wZvOe4CmsyHHGVBEfSB kqKyF7SgaueHaD8vr/t4Z97zPwZYFW1m6AXg3vAHk6nXambXI8 n32lsMaCoEO1dvjJz7X8XzVKbuZLBSKhH4HiSm+vFT2FvPnHlz mrnoKjYzdxnC55aG2fJysuQYwKxyyLNB596zaG0z25jcNIbAty jRgk1nV69OC1Z2QIXP75q/mBYi5YC36cqKpAbG0iMzExfnwbbk MYv84hjcdNjQx5CF45VTJvMiPvG+dsbShkfaXxf3LmqPNefNf/ Q+7IerrtAuORNVbXIWTDcnfV5ntEAG5V3nLSboFojdtRcv1v3E Tzn2M4RSt1cMQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King , arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org ARMv3 support was removed in 357c9c1f07 "ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs", which explicitly left parts of the CPU32v3 support in place for building RiscPC. However, this does not actually build in my test setup. This is probably not the right solution, but maybe someone has a better idea for how to deal with this. Without this patch, building rpc_defconfig results in: arch/arm/lib/io-readsw-armv4.S: Assembler messages: arch/arm/lib/io-readsw-armv4.S:23: Error: selected processor does not support ARM mode `ldrh ip,[r0]' arch/arm/lib/io-readsw-armv4.S:25: Error: selected processor does not support ARM mode `strh ip,[r1],#2' arch/arm/lib/io-readsw-armv4.S:38: Error: selected processor does not support ARM mode `ldrh r3,[r0]' make[2]: *** [arch/arm/lib/io-readsw-armv4.o] Error 1 make[1]: *** [arch/arm/lib] Error 2 Signed-off-by: Arnd Bergmann Cc: Russell King --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 - arch/arm/mm/Kconfig | 12 ++---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e91c7cd..1e435185 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2259,7 +2259,7 @@ config FPE_NWFPE_XP config FPE_FASTFPE bool "FastFPE math emulation (EXPERIMENTAL)" - depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL + depends on (!AEABI || OABI_COMPAT) && EXPERIMENTAL ---help--- Say Y here to include the FAST floating point emulator in the kernel. This is an experimental much faster emulator which now also has full diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b4c2296..2c53344 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -70,7 +70,6 @@ endif arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t) arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4t arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 -arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3 # This selects how we optimise for the processor. tune-$(CONFIG_CPU_ARM7TDMI) :=-mtune=arm7tdmi diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 101b968..28773e6 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -265,8 +265,7 @@ config CPU_ARM1026 # SA110 config CPU_SA110 bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC - select CPU_32v3 if ARCH_RPC - select CPU_32v4 if !ARCH_RPC + select CPU_32v4 select CPU_ABRT_EV4 select CPU_PABRT_LEGACY select CPU_CACHE_V4WB @@ -395,12 +394,6 @@ config CPU_V7 # Figure out what processor architecture version we should be using. # This defines the compiler instruction set which depends on the machine type. -config CPU_32v3 - bool - select TLS_REG_EMUL if SMP || !MMU - select NEEDS_SYSCALL_FOR_CMPXCHG if SMP - select CPU_USE_DOMAINS if MMU - config CPU_32v4 bool select TLS_REG_EMUL if SMP || !MMU @@ -587,8 +580,7 @@ comment "Processor Features" config ARM_LPAE bool "Support for the Large Physical Address Extension" - depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \ - !CPU_32v4 && !CPU_32v3 + depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && !CPU_32v4 help Say Y if you have an ARMv7 processor supporting the LPAE page table format and you would like to access memory beyond the