[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-147-gfb9edbb4d
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2019-11-29 15:44:59
|
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 fb9edbb4da86e85986150cf6786cabdf5f1056dc (commit)
from 657f4e7bc4e146b5fbf997d9a0bedd833121c9c5 (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 fb9edbb4da86e85986150cf6786cabdf5f1056dc
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Nov 29 16:41:35 2019 +0100
[BUILDROOT] fixes opos6ullegacy-4.9_defconfig
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ullegacy-4.9_defconfig | 3 -
...516-armadeus-imx6ull-rename-flexcan-nodes.patch | 84 +++++++++++++++++++++-
2 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index 5169cbf35..7b2a09ec1 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -7,9 +7,6 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-# For BR 2017.02:
-BR2_GCC_VERSION_6_X=y
-#
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_HOST_GDB=y
BR2_PACKAGE_HOST_GDB_TUI=y
diff --git a/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch b/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
index 6b455ca30..2b3445dc2 100644
--- a/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
+++ b/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
@@ -13,7 +13,7 @@ Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
ethernet0 = &fec1;
ethernet1 = &fec2;
gpio0 = &gpio1;
-@@ -473,7 +473,7 @@
+@@ -479,7 +479,7 @@
#pwm-cells = <2>;
};
@@ -22,7 +22,7 @@ Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
reg = <0x02090000 0x4000>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-@@ -484,7 +484,7 @@
+@@ -490,7 +490,7 @@
status = "disabled";
};
@@ -31,3 +31,83 @@ Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
reg = <0x02094000 0x4000>;
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
+@@ -14,6 +14,6 @@
+ status = "disabled";
+ };
+
+-&flexcan2 {
++&can2 {
+ status = "okay";
+ };
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts
+@@ -8,7 +8,7 @@
+
+ #include "imx6ull-14x14-ddr3-arm2.dts"
+
+-&flexcan2 {
++&can2 {
+ status = "disabled";
+ };
+
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
+@@ -195,7 +195,7 @@
+ };
+ };
+
+-&flexcan2 {
++&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ xceiver-supply = <®_can2_3v3>;
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-evk.dts
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull-14x14-evk.dts
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-14x14-evk.dts
+@@ -198,14 +198,14 @@
+ };
+ };
+
+-&flexcan1 {
++&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ xceiver-supply = <®_can_3v3>;
+ status = "okay";
+ };
+
+-&flexcan2 {
++&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ xceiver-supply = <®_can_3v3>;
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull-9x9-evk.dts
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+@@ -227,14 +227,14 @@
+ };
+ };
+
+-&flexcan1 {
++&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ xceiver-supply = <®_can_3v3>;
+ status = "okay";
+ };
+
+-&flexcan2 {
++&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ xceiver-supply = <®_can_3v3>;
hooks/post-receive
--
armadeus
|