From patchwork Mon Sep 9 16:31:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 2862531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 468B89F495 for ; Mon, 9 Sep 2013 16:31:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1998C2039D for ; Mon, 9 Sep 2013 16:31:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA71D2037E for ; Mon, 9 Sep 2013 16:31:37 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ4NA-0005hs-2q; Mon, 09 Sep 2013 16:31:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ4N7-0003Zw-OQ; Mon, 09 Sep 2013 16:31:29 +0000 Received: from mail-qe0-f53.google.com ([209.85.128.53]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ4N5-0003ZD-Ds for linux-arm-kernel@lists.infradead.org; Mon, 09 Sep 2013 16:31:28 +0000 Received: by mail-qe0-f53.google.com with SMTP id jy17so1678776qeb.40 for ; Mon, 09 Sep 2013 09:31:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=q51mcql6LObSq5AJ6SEYfAO4m9kokdq6QB67OvjPlkY=; b=fk3F0vtKb9RgcLQEa0x606Iq6TPMjem1wJo6jpqC1R7xG05RpgYmv148/p7MZZGvEO QWhuWHVG9NQ54UdVZKqJlrQ/Jmds6OVrm7A8jPFDi3nOg+39B3SSWzo43CU+MgQiBuBf 0UocAkESeUXrZqvCL9E9+B6VL6HHth8gnK+8wzILb6/qOFQVq2Uxe5XMg4H0YmydpGeD i4V+qvLSrHcinGW7wBTQD64VmS5n1WzRA8l7Ixq49e3uUPTPpVchlYB9HURJm0fwvMIy AK9A8wgof/ZDnE4Njp+/ODoPiPck1hVIIgNxETyOYHp0b/algGpdL+2F/OTFK6tWvZQU HSjQ== X-Gm-Message-State: ALoCoQkNJV4hylJ74qWsjRp7/n5kXGorYet6vLNG/ah6EbpChFVMyrdQTh3vbyahadox92rv8YCP X-Received: by 10.224.75.201 with SMTP id z9mr2544704qaj.71.1378744266030; Mon, 09 Sep 2013 09:31:06 -0700 (PDT) Received: from xanadu.home (modemcable044.209-83-70.mc.videotron.ca. [70.83.209.44]) by mx.google.com with ESMTPSA id h2sm26639283qev.0.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 09 Sep 2013 09:31:05 -0700 (PDT) Date: Mon, 9 Sep 2013 12:31:04 -0400 (EDT) From: Nicolas Pitre To: Olof Johansson , Kevin Hilman Subject: [PATCH] ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build Message-ID: User-Agent: Alpine 2.03 (LFD 1266 2009-07-14) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130909_123127_517994_F7EBED6C X-CRM114-Status: UNSURE ( 7.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes the following build error: /tmp/cce439dZ.s: Assembler messages: /tmp/cce439dZ.s:506: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:512: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:513: Error: selected processor does not support ARM mode `dsb ' /tmp/cce439dZ.s:583: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:589: Error: selected processor does not support ARM mode `isb ' /tmp/cce439dZ.s:590: Error: selected processor does not support ARM mode `dsb ' Tested-by: Guenter Roeck Signed-off-by: Nicolas Pitre Tested-by: Kevin Hilman diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile index 36ea824712..505e64ab3e 100644 --- a/arch/arm/mach-vexpress/Makefile +++ b/arch/arm/mach-vexpress/Makefile @@ -7,6 +7,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ obj-y := v2m.o obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o +CFLAGS_dcscb.o += -march=armv7-a obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o spc.o +CFLAGS_tc2_pm.o += -march=armv7-a obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o