From patchwork Tue Sep 6 12:53:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101866 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp532111qgf; Tue, 6 Sep 2016 05:53:57 -0700 (PDT) X-Received: by 10.98.13.84 with SMTP id v81mr73146747pfi.108.1473166437837; Tue, 06 Sep 2016 05:53:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si30427868pae.172.2016.09.06.05.53.57; Tue, 06 Sep 2016 05:53:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934248AbcIFMxs (ORCPT + 27 others); Tue, 6 Sep 2016 08:53:48 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:60814 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754890AbcIFMxq (ORCPT ); Tue, 6 Sep 2016 08:53:46 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MLnvv-1bgz1X34Gh-000qSh; Tue, 06 Sep 2016 14:53:04 +0200 From: Arnd Bergmann To: Shawn Guo Cc: Anson Huang , Arnd Bergmann , Sascha Hauer , Fabio Estevam , Alexander Shiyan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: imx: build cpuidle-imx6sx.o for imx6ul Date: Tue, 6 Sep 2016 14:53:25 +0200 Message-Id: <20160906125338.1530603-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:83H+hpuc6XD708pYTEGNgT+YNFkft64C+IJb3lWR0n3c1kn+geL jlaLXw0tqa2t7kgp8Qhhm9AtB03plmAOL5KVRhUFZG5lzDmkKl2TluIChdcbyg6xMEoFJ4a RDzsnXlyoKXWsuvFLMvZEbhoekpQ2IQog4DmYrMe3iN5jLLxzf4nVukDE7SgbYRlLiYppBs 8eEfm1JsjISsK7OvxdqtA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Zz61DijefgE=:Vne55BV75RyFonFlACsqXC 1IJP+yI33hFxZlKWdK/KbLiMQtlyULhSw8cGpZgl5WVyM56hLLIprLwdTFYMsnvZpfWyAqClz pTndXxTukPgBJfcc9R0IW3M/QAFZVFl5PsgLIYpoP7QJvKYHfSK2YeLHZioMGASdEDgTrtsyZ ViwcohwtjGNs93SLoT6P5KTFbIgHkclWikphHQlPGs9r2/zhxJH461NKgDPhpfIkMaWkwKnXC PsEBVupDSGMqxbUAUbKrQbApUpIoyxCMt5dzS2us3lhMkDiN8+jal31zxL+XHzu5lle++ResZ ZonunG78eRwHZ96siIe7hbvo8WybwWSAUMqT+hN8ffXDdHuE+pBr4ntBnRuiG28POgWHT5KV9 jyp8JLHGvsc3UnRDQU+DEOPt3DYyHIjQ4c8CkO43knntC+JDiXD/KqyuvRRfXMHm1i/hszZ08 I+65t67ct/yA5TNOX6XjM4aG6WGgtOnEKKN65ocuXL01O5lQ6r34icWW3bBYY3iCcT3yhWD5S yycb0n8QquxllKHMCoLa5JO5ITOhZTMMLVacwxO18vfcPr4ETZ9c8CVOA7R2NqYPiMspvBVij 4+XUbiGY6phr8BUVGjlMW6xJX3gAmUzxXIdVRWYk97A/UYzq3U6sJNIMTNHfS3nMQIMI0Qf6y zSIHYFCIB9ZgFsTgfEjJXKtp2N+tXNsitTPY7aKArR9UMEESJeZ/+ujEXdKWOX1GzsA4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The imx6ul soc code gained support for cpuidle, but that causes a link failure if CONFIG_SOC_IMX6SX is disabled: arch/arm/mach-imx/mach-imx6ul.o: In function `imx6ul_init_late': mach-imx6ul.c:(.init.text+0xc): undefined reference to `imx6sx_cpuidle_init' This adds the file containing the imx6sx_cpuidle_init function to the kernel for 6ul-only configurations. Signed-off-by: Arnd Bergmann Fixes: 547e8f526959 ("ARM: imx: add cpuidle support for i.mx6ul") --- arch/arm/mach-imx/Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index edce8dfa581d..737450fe790c 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o +obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o endif ifdef CONFIG_SND_IMX_SOC