code.ossystems Code Review - meta-freescale.git/blob

   1 From 2e9ea279e6c4e94c8a760355f80461599d2ba5aa Mon Sep 17 00:00:00 2001
   2 From: Nikolay Dimitrov <picmaster@mail.bg>
   3 Date: Sun, 8 Feb 2015 22:18:09 +0200
   4 Subject: [PATCH] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC
   5  support is disabled
   6
   7 Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some
   8 hard-coded stuff. The patch purpose is to handle enabling/disabling this
   9 config option.
  10
  11 Signed-off-by: Nikolay Dimitrov <picmaster@mail.bg>
  12 ---
  13  arch/arm/mach-imx/Makefile |    3 ++-
  14  arch/arm/mach-imx/mxc.h    |    4 ++++
  15  2 files changed, 6 insertions(+), 1 deletion(-)
  16
  17 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
  18 index 482c310..ae89b39 100644
  19 --- a/arch/arm/mach-imx/Makefile
  20 +++ b/arch/arm/mach-imx/Makefile
  21 @@ -112,7 +112,8 @@ ifeq ($(CONFIG_ARM_IMX6_CPUFREQ),y)
  22  obj-y += busfreq-imx6.o
  23  obj-$(CONFIG_SOC_IMX6Q) += ddr3_freq_imx6.o busfreq_ddr3.o
  24  obj-$(CONFIG_SOC_IMX6SL) += lpddr2_freq_imx6.o busfreq_lpddr2.o imx6sl_wfi.o
  25 -obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o
  26 +obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6.o \
  27 +       lpddr2_freq_imx6sx.o busfreq_lpddr2.o imx6sx_low_power_idle.o
  28
  29  endif
  30
  31 diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
  32 index 88c4bce..9e412ee 100644
  33 --- a/arch/arm/mach-imx/mxc.h
  34 +++ b/arch/arm/mach-imx/mxc.h
  35 @@ -161,10 +161,14 @@ static inline bool cpu_is_imx6sx(void)
  36         return __mxc_cpu_type == MXC_CPU_IMX6SX;
  37  }
  38
  39 +#ifdef CONFIG_SOC_IMX6SL
  40  static inline bool cpu_is_imx6sl(void)
  41  {
  42         return __mxc_cpu_type == MXC_CPU_IMX6SL;
  43  }
  44 +#else
  45 +# define cpu_is_imx6sl() (0)
  46 +#endif
  47
  48  static inline bool cpu_is_imx6dl(void)
  49  {
  50 --
  51 1.7.10.4
  52