Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id C3D86E0048B; Sun, 15 Feb 2015 05:24:16 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (picmaster[at]mail.bg) * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [193.201.172.118 listed in list.dnswl.org] * -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 Received: from mx2.mail.bg (mx2.mail.bg [193.201.172.118]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0EC23E0043F for ; Sun, 15 Feb 2015 05:24:12 -0800 (PST) Received: from localhost.localdomain (unknown [93.152.143.60]) by mx2.mail.bg (Postfix) with ESMTPA id 1B1696000704; Sun, 15 Feb 2015 15:24:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mail.bg; s=default; t=1424006648; bh=Xuw3ld+9d3SNPiYtryuu1LmBzs7c6vu1N5GB8tkVUUQ=; h=From:To:Cc:Subject:Date:Message-Id; b=3sbdlwmale8fceLin/3+7Y5h4ewhEiJyofeSHQLCBoNz+TCfjS4uqt8X04RjxBob/ 9p3F2eCB9F0lu2CxwcWRYRcr5Hlr3Oly0D7XrwXyM6GBN4nIL6IbyP/Yw4kD9RBwvl 8h35J2NSgK1ZcXhN6V8T9J255jU+oDl0P25n4p1c= From: Nikolay Dimitrov To: meta-freescale@yoctoproject.org Date: Sun, 15 Feb 2015 15:24:06 +0200 Message-Id: <1424006646-9940-1-git-send-email-picmaster@mail.bg> X-Mailer: git-send-email 1.7.10.4 Cc: fabio.estevam@freescale.com, otavio@ossystems.com.br, wally.yeh@atrustcorp.com Subject: [meta-fsl-arm][dizzy][PATCH] linux-imx: Disable imx6sl-specific code when imx6sl SOC support is disabled X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2015 13:24:16 -0000 Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some hard-coded stuff. The patch purpose is to handle enabling/disabling this config option. Signed-off-by: Nikolay Dimitrov --- ...Disable-imx6sl-specific-code-when-imx6sl-.patch | 37 ++++++++++++++++++++ recipes-kernel/linux/linux-imx_3.10.17.bb | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-imx-3.10.17/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch diff --git a/recipes-kernel/linux/linux-imx-3.10.17/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/recipes-kernel/linux/linux-imx-3.10.17/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch new file mode 100644 index 0000000..81c2b2e --- /dev/null +++ b/recipes-kernel/linux/linux-imx-3.10.17/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch @@ -0,0 +1,37 @@ +From d677e1c37de1fe3b91f8ccfe92fc98bec437d10e Mon Sep 17 00:00:00 2001 +From: Nikolay Dimitrov +Date: Sun, 15 Feb 2015 13:10:27 +0200 +Subject: [PATCH] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC + support is disabled + +Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some +hard-coded stuff. The patch purpose is to handle enabling/disabling this +config option. + +Signed-off-by: Nikolay Dimitrov +--- + arch/arm/mach-imx/mxc.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h +index c78174d..de99050 100644 +--- a/arch/arm/mach-imx/mxc.h ++++ b/arch/arm/mach-imx/mxc.h +@@ -155,10 +155,14 @@ extern unsigned int __mxc_cpu_type; + #endif + + #ifndef __ASSEMBLY__ ++# ifdef CONFIG_SOC_IMX6SL + static inline bool cpu_is_imx6sl(void) + { + return __mxc_cpu_type == MXC_CPU_IMX6SL; + } ++# else ++# define cpu_is_imx6sl() (0) ++# endif + + static inline bool cpu_is_imx6dl(void) + { +-- +1.7.10.4 + diff --git a/recipes-kernel/linux/linux-imx_3.10.17.bb b/recipes-kernel/linux/linux-imx_3.10.17.bb index 143eaab..17eb4fa 100644 --- a/recipes-kernel/linux/linux-imx_3.10.17.bb +++ b/recipes-kernel/linux/linux-imx_3.10.17.bb @@ -15,6 +15,8 @@ SRCBRANCH = "imx_3.10.17_1.0.0_ga" SRCREV = "33597e348b2d60dd5c71890ef7b7d3d3fd6e4e97" LOCALVERSION = "-1.0.2_ga" -SRC_URI += "file://0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch" +SRC_URI += "file://0001-ARM-clk-imx6q-fix-video-divider-for-revision-1.0-of-.patch \ + file://0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch \ +" COMPATIBLE_MACHINE = "(mx6)" -- 1.7.10.4