From: Nikolay Dimitrov <picmaster@mail.bg>
Date: Sun, 8 Feb 2015 21:36:49 +0000 (+0200)
Subject: linux-imx: Disable imx6sl-specific code when imx6sl SOC support is disabled
X-Git-Tag: 2.1~656
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e4a7f6ffac1af8a17a5aa955884e85d80911d4ff;p=meta-freescale.git

linux-imx: 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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
new file mode 100644
index 00000000..cbd0b588
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-3.10.53/0002-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch
@@ -0,0 +1,52 @@
+From 2e9ea279e6c4e94c8a760355f80461599d2ba5aa Mon Sep 17 00:00:00 2001
+From: Nikolay Dimitrov <picmaster@mail.bg>
+Date: Sun, 8 Feb 2015 22:18:09 +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/Makefile |    3 ++-
+ arch/arm/mach-imx/mxc.h    |    4 ++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
+index 482c310..ae89b39 100644
+--- a/arch/arm/mach-imx/Makefile
++++ b/arch/arm/mach-imx/Makefile
+@@ -112,7 +112,8 @@ ifeq ($(CONFIG_ARM_IMX6_CPUFREQ),y)
+ obj-y += busfreq-imx6.o
+ obj-$(CONFIG_SOC_IMX6Q) += ddr3_freq_imx6.o busfreq_ddr3.o
+ obj-$(CONFIG_SOC_IMX6SL) += lpddr2_freq_imx6.o busfreq_lpddr2.o imx6sl_wfi.o
+-obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o
++obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6.o \
++	lpddr2_freq_imx6sx.o busfreq_lpddr2.o imx6sx_low_power_idle.o
+ 
+ endif
+ 
+diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
+index 88c4bce..9e412ee 100644
+--- a/arch/arm/mach-imx/mxc.h
++++ b/arch/arm/mach-imx/mxc.h
+@@ -161,10 +161,14 @@ static inline bool cpu_is_imx6sx(void)
+ 	return __mxc_cpu_type == MXC_CPU_IMX6SX;
+ }
+ 
++#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/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.53.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.53.bb
index f75aa21c..b02b3dac 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.53.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.53.bb
@@ -14,6 +14,8 @@ SRCBRANCH = "imx_3.10.53_1.1.0_ga"
 LOCALVERSION = "-1.1.0_ga"
 SRCREV = "496fbe0b831b77d0ea0a2c7bbd1d58820b3a01f7"
 
-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)"