[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-287-gaa2e2c1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-287-gaa2e2c1
|
From: Sébastien S. <ss...@us...> - 2017-04-27 16:07:15
|
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 aa2e2c117643cdda32e9dc2076b35cd19d286e21 (commit)
from 6c525f83c3c0f23d893a3b8429d11fac5937da5a (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 aa2e2c117643cdda32e9dc2076b35cd19d286e21
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 27 18:11:33 2017 +0200
[LINUX] 4.10: port some patches to try out FPGA on APF6_SP
-----------------------------------------------------------------------
Summary of changes:
patches/linux/4.10.13 | 1 +
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 36 ++++++++++------------
.../0700-armadeus-pcie_clk_defined_in_uboot.patch | 12 ++++----
4 files changed, 24 insertions(+), 25 deletions(-)
create mode 120000 patches/linux/4.10.13
copy patches/linux/{3.10 => 4.10}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.14 => 4.10}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (73%)
copy patches/linux/{3.19 => 4.10}/0700-armadeus-pcie_clk_defined_in_uboot.patch (76%)
diff --git a/patches/linux/4.10.13 b/patches/linux/4.10.13
new file mode 120000
index 0000000..9add334
--- /dev/null
+++ b/patches/linux/4.10.13
@@ -0,0 +1 @@
+4.10
\ No newline at end of file
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/4.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.14/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 73%
copy from patches/linux/3.14/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index ce666db..0e97eb2 100644
--- a/patches/linux/3.14/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/4.10/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,8 +1,8 @@
-Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
===================================================================
---- linux-3.12-rc1.orig/scripts/kconfig/zconf.tab.c_shipped
-+++ linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
-@@ -85,6 +85,8 @@
+--- linux-4.10.13.orig/scripts/kconfig/zconf.tab.c_shipped
++++ linux-4.10.13/scripts/kconfig/zconf.tab.c_shipped
+@@ -83,6 +83,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
@@ -11,7 +11,7 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
#include "lkc.h"
-@@ -92,6 +94,7 @@
+@@ -90,6 +92,7 @@
#define PRINTD 0x0001
#define DEBUG_PARSE 0x0002
@@ -19,16 +19,15 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
int cdebug = PRINTD;
-@@ -108,6 +111,27 @@ static struct menu *current_menu, *curre
+@@ -103,8 +106,25 @@ struct symbol *symbol_hash[SYMBOL_HASHSI
+ static struct menu *current_menu, *current_entry;
-
-+
+static int isDir(const char *, const char *);
-+
+
+int isDir(const char *fullpath, const char *dname) {
+ struct stat sbuf;
-+
+
+ if (*dname == '.')
+ return 0;
+
@@ -43,12 +42,11 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+
+ return 0;
+}
-+
- /* Enabling traces. */
- #ifndef YYDEBUG
- # define YYDEBUG 1
-@@ -1922,8 +1946,31 @@ yyreduce:
- case 83:
+
+ # ifndef YY_NULLPTR
+ # if defined __cplusplus && 201103L <= __cplusplus
+@@ -1805,8 +1825,31 @@ yyreduce:
+ case 85:
{
+ char *name;
@@ -58,8 +56,8 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ struct dirent *lecture;
+ DIR *rep;
+
- printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
-- zconf_nextfile((yyvsp[(2) - (3)].string));
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
+- zconf_nextfile((yyvsp[-1].string));
+ name = (yyvsp[(2) -(3)].string);
+ ptr = strchr(name, '*');
+ if(ptr != NULL) {
@@ -78,5 +76,5 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ zconf_nextfile((yyvsp[(2) - (3)].string));
+ }
}
- break;
+ break;
diff --git a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 76%
copy from patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
index 0590740..0e49f60 100644
--- a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -6,11 +6,11 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Sébastien Szymanski <seb...@ar...>
---
-Index: linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
+Index: linux-4.10.13/drivers/clk/imx/clk-imx6q.c
===================================================================
---- linux-3.19.3.orig/arch/arm/mach-imx/clk-imx6q.c
-+++ linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
-@@ -522,8 +522,13 @@ static void __init imx6q_clocks_init(str
+--- linux-4.10.13.orig/drivers/clk/imx/clk-imx6q.c
++++ linux-4.10.13/drivers/clk/imx/clk-imx6q.c
+@@ -893,8 +893,13 @@ static void __init imx6q_clocks_init(str
clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
/* All existing boards with PCIe use LVDS1 */
@@ -24,5 +24,5 @@ Index: linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
+ clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
+ }
- /* Set initial power mode */
- imx6q_set_lpm(WAIT_CLOCKED);
+ /*
+ * Initialize the GPU clock muxes, so that the maximum specified clock
hooks/post-receive
--
armadeus
|