diff options
| -rw-r--r-- | recipes-kernel/linux/linux-imx-3.10.17/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch | 37 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx_3.10.17.bb | 4 |
2 files changed, 40 insertions, 1 deletions
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 <picmaster@mail.bg> +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 <picmaster@mail.bg> +--- + 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)" |