From patchwork Thu Sep 27 15:10:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1514941 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 29AD03FC71 for ; Thu, 27 Sep 2012 15:18:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1THFjb-0001NL-Nz; Thu, 27 Sep 2012 15:10:39 +0000 Received: from mail-oa0-f49.google.com ([209.85.219.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1THFjR-0001M6-55 for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2012 15:10:37 +0000 Received: by oagl10 with SMTP id l10so2036120oag.36 for ; Thu, 27 Sep 2012 08:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=jQ97x6vn/XmYhRRBGpuhnjTLfDxB397RXjEGkHhoqGc=; b=QHXxcg1Uo9FQN8LyoJdmtsx3rsGfLP+A2PBETHbFQXYHx2EBBWnGBVZfpqehKDLMHZ 6Vx/OFcA9503mcklctGVDevutTBx/Ss3nFr+GEJdpQUyA9p9bDxnFnIzpOFiApHMiFNx l09IsAcjhrdX0Jt+Kr4b38XuVcLMqZS/izHDCm208YftkUGzD+R9beg3v5kyF46GVmVG MWHPHXMEPC3QSTDPXu07Ncf4b/vEmlp2cCGx2K3A2Ui1RbrLwvARL0L4OMLHqixv82pO ITQGtuUE3Z3pLTKBTbmaR+hs49rapzgVKbEq3MPduv+TI4vnTv94XxYLgdwXx9q0DNit Us0g== Received: by 10.60.169.145 with SMTP id ae17mr3442406oec.50.1348758627442; Thu, 27 Sep 2012 08:10:27 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id 2sm5866540obi.20.2012.09.27.08.10.23 (version=SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:10:25 -0700 (PDT) From: Rob Herring To: arm@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: mvebu: fix build breaks from multi-platform conversion Date: Thu, 27 Sep 2012 10:10:12 -0500 Message-Id: <1348758612-27012-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Thomas Petazzoni , Gregory CLEMENT , Jason Cooper , Rob Herring , Andrew Lunn 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 From: Rob Herring Moving ARCH_MVEBU for multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build. Signed-off-by: Rob Herring Cc: Thomas Petazzoni Cc: Gregory CLEMENT Cc: Jason Cooper Cc: Andrew Lunn Acked-by: Thomas Petazzoni Acked-by: Arnd Bergmann --- arch/arm/mach-mvebu/Kconfig | 2 ++ arch/arm/mach-mvebu/Makefile | 3 ++- arch/arm/plat-orion/Makefile | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 26a817d..416d46e 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -6,6 +6,8 @@ config ARCH_MVEBU select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select PINCTRL + select PLAT_ORION select SPARSE_IRQ if ARCH_MVEBU diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index cbe5664..57f996b 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,4 +1,5 @@ -ccflags-$(ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ + -I$(srctree)/arch/arm/plat-orion/include obj-y += system-controller.o obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile index 1251e5b..a82cecb 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/plat-orion/Makefile @@ -1,6 +1,7 @@ # # Makefile for the linux kernel. # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include obj-y += addr-map.o