[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-302-g5548808

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  55488086fc91c94e43c47bf9ff250171f7b12309 (commit)
      from  aa4f9a4873cdfd85fb48bb3e9da67ba7aa0a6ca9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 55488086fc91c94e43c47bf9ff250171f7b12309
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Thu Jul 13 12:23:28 2017 +0200

    [LINUX] fixes apf6legacy-4.1_defconfig build

-----------------------------------------------------------------------

Summary of changes:
 ...and-simple-assumptions-in-imx6sll-support.patch | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch

diff --git a/patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch b/patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch
new file mode 100644
index 0000000..f68976d
--- /dev/null
+++ b/patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch
@@ -0,0 +1,64 @@
+I'm not exactly sure how to properly fix the cpuidle part as the whole file seems to assume all IMX* are enabled
+so this is mostly a "bug-report" instead of a proper patch
+
+arch/arm/mach-imx/built-in.o: In function `init_mmdc_lpddr2_settings':
+platform-imx-dma.c:(.text+0x9938): undefined reference to `imx6sll_lpddr2_freq_change'
+platform-imx-dma.c:(.text+0x993c): undefined reference to `imx6sll_lpddr2_freq_change'
+arch/arm/mach-imx/built-in.o: In function `imx6sl_init_late':
+platform-imx-dma.c:(.init.text+0xdef0): undefined reference to `imx6sll_cpuidle_init'
+
+Signed-off-by: Alejandro Mery <am...@ha...>
+---
+ arch/arm/mach-imx/common.c  |  2 +-
+ arch/arm/mach-imx/cpuidle.h | 14 +++++++++-----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/mach-imx/common.c b/arch/arm/mach-imx/common.c
+index 3016f60ce141..2f644c6b2c28 100644
+--- a/arch/arm/mach-imx/common.c
++++ b/arch/arm/mach-imx/common.c
+@@ -132,7 +132,7 @@ u32 imx6_lpddr2_freq_change_start, imx6_lpddr2_freq_change_end;
+ void mx6_lpddr2_freq_change(u32 freq, int bus_freq_mode) {}
+ #endif
+ 
+-#if !defined(CONFIG_SOC_IMX6SL)
++#if !defined(CONFIG_SOC_IMX6SLL)
+ void imx6sll_lpddr2_freq_change(u32 freq, int bus_freq_mode) {}
+ #endif
+ 
+diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h
+index 8e0c1aa2daf6..592724811607 100644
+--- a/arch/arm/mach-imx/cpuidle.h
++++ b/arch/arm/mach-imx/cpuidle.h
+@@ -10,11 +10,19 @@
+  * http://www.gnu.org/copyleft/gpl.html
+  */
+ 
++#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SOC_IMX6SLL)
++extern int imx6sll_cpuidle_init(void);
++#else
++static inline int imx6sll_cpuidle_init(void)
++{
++	return 0;
++}
++#endif
++
+ #ifdef CONFIG_CPU_IDLE
+ extern int imx5_cpuidle_init(void);
+ extern int imx6q_cpuidle_init(void);
+ extern int imx6sl_cpuidle_init(void);
+-extern int imx6sll_cpuidle_init(void);
+ extern int imx6sx_cpuidle_init(void);
+ extern int imx6ul_cpuidle_init(void);
+ extern int imx7d_cpuidle_init(void);
+@@ -32,10 +40,6 @@ static inline int imx6sl_cpuidle_init(void)
+ {
+ 	return 0;
+ }
+-static inline int imx6sll_cpuidle_init(void)
+-{
+-	return 0;
+-}
+ static inline int imx6sx_cpuidle_init(void)
+ {
+ 	return 0;


hooks/post-receive
-- 
armadeus