[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-370-gb624770
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2018-02-06 09:01:45
|
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 b624770570689b3b35040418a7c0be2a098fc61e (commit)
from f61d30b7ff3eb936fd323f0156555ba5d1fedc22 (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 b624770570689b3b35040418a7c0be2a098fc61e
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 6 10:10:18 2018 +0100
[LINUX] opos6ul: bump tp 4.14.17 (LTS)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
.../armadeus/opos6ul/opos6ul-linux-4.14.17.config | 1 +
...-linux-4.9.config => opos6ul-linux-4.14.config} | 0
patches/linux/4.14.17 | 1 +
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
...he-enet_out-clock-is-being-enabled.patch.tofix} | 0
.../0703-armadeus-mxs-uart-add-rs485-support.patch | 0
...armadeus-dts-opos6uldev-LQ043-LCD-support.patch | 37 ++++++++++++++++++++++
...rmadeus-dts-opos6uldev-add-csi-pin-muxing.patch | 29 +++++++++++++++++
...-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch | 33 +++++++++++--------
...3-armadeus-brcmfmac-increase-boot-timeout.patch | 0
11 files changed, 88 insertions(+), 15 deletions(-)
create mode 120000 buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.17.config
copy buildroot/target/device/armadeus/opos6ul/{opos6ul-linux-4.9.config => opos6ul-linux-4.14.config} (100%)
create mode 120000 patches/linux/4.14.17
copy patches/linux/{4.8 => 4.14}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
copy patches/linux/{4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch => 4.14/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch.tofix} (100%)
copy patches/linux/{4.9 => 4.14}/0703-armadeus-mxs-uart-add-rs485-support.patch (100%)
create mode 100644 patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
create mode 100644 patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
copy patches/linux/{4.9 => 4.14}/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch (94%)
copy patches/linux/{4.9 => 4.14}/0803-armadeus-brcmfmac-increase-boot-timeout.patch (100%)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 6e4c2d0..541fa9b 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.17"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.17.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.17.config
new file mode 120000
index 0000000..8ed2323
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.17.config
@@ -0,0 +1 @@
+opos6ul-linux-4.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.9.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.config
similarity index 100%
copy from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.9.config
copy to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.14.config
diff --git a/patches/linux/4.14.17 b/patches/linux/4.14.17
new file mode 120000
index 0000000..262371b
--- /dev/null
+++ b/patches/linux/4.14.17
@@ -0,0 +1 @@
+4.14
\ No newline at end of file
diff --git a/patches/linux/4.8/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/4.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/4.8/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/4.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch b/patches/linux/4.14/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch.tofix
similarity index 100%
copy from patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
copy to patches/linux/4.14/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch.tofix
diff --git a/patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch
similarity index 100%
copy from patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch
copy to patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch
diff --git a/patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch b/patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
new file mode 100644
index 0000000..53e16b1
--- /dev/null
+++ b/patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Julien BOIBESSOT <jul...@ar...>
+Index: linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+===================================================================
+--- linux-4.14.17.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -191,7 +191,7 @@
+ bus-width = <18>;
+
+ display-timings {
+- timing0: timing0 {
++ ST0700 {
+ clock-frequency = <33000033>;
+ hactive = <800>;
+ vactive = <480>;
+@@ -204,6 +204,22 @@
+ de-active = <1>;
+ pixelclk-active = <0>;
+ };
++
++ LQ043 {
++ clock-frequency = <8690000>;
++ hactive = <480>;
++ vactive = <272>;
++ hback-porch = <16>;
++ hfront-porch = <16>;
++ vback-porch = <4>;
++ vfront-porch = <2>;
++ hsync-len = <4>;
++ vsync-len = <4>;
++ hsync-active = <0>;
++ vsync-active = <0>;
++ de-active = <0>;
++ pixelclk-active = <1>;
++ };
+ };
+ };
+ };
diff --git a/patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch b/patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
new file mode 100644
index 0000000..de984a6
--- /dev/null
+++ b/patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
@@ -0,0 +1,29 @@
+Signed-off-by: Julien BOIBESSOT <jul...@ar...>
+Index: linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+===================================================================
+--- linux-4.14.17.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -275,6 +275,23 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
++ pinctrl_csi1: csi1grp {
++ fsl,pins = <
++ MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
++ MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK 0x1b088
++ MX6UL_PAD_CSI_VSYNC__CSI_VSYNC 0x1b088
++ MX6UL_PAD_CSI_HSYNC__CSI_HSYNC 0x1b088
++ MX6UL_PAD_CSI_DATA00__CSI_DATA02 0x1b088
++ MX6UL_PAD_CSI_DATA01__CSI_DATA03 0x1b088
++ MX6UL_PAD_CSI_DATA02__CSI_DATA04 0x1b088
++ MX6UL_PAD_CSI_DATA03__CSI_DATA05 0x1b088
++ MX6UL_PAD_CSI_DATA04__CSI_DATA06 0x1b088
++ MX6UL_PAD_CSI_DATA05__CSI_DATA07 0x1b088
++ MX6UL_PAD_CSI_DATA06__CSI_DATA08 0x1b088
++ MX6UL_PAD_CSI_DATA07__CSI_DATA09 0x1b088
++ >;
++ };
++
+ pinctrl_ecspi4: ecspi4grp {
+ fsl,pins = <
+ MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
diff --git a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
similarity index 94%
copy from patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
copy to patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
index 8234b61..bba6cd5 100644
--- a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
+++ b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
@@ -20,22 +20,23 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-Index: linux-4.9.35/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-4.9.35.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.9.35/arch/arm/boot/dts/Makefile
-@@ -421,6 +421,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-14x14-evk.dtb \
- imx6ul-geam-kit.dtb \
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 9c5e1d9..dcbb2b0 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -467,6 +467,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+ imx6ul-isiot-nand.dtb \
+ imx6ul-liteboard.dtb \
imx6ul-opos6uldev.dtb \
+ imx6ul-opos6ulnanodev.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
-Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-===================================================================
+diff --git a/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+new file mode 100644
+index 0000000..cb89eba
--- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -177,7 +178,7 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
+ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x130b0
+ MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x130b0
-+ MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x130b0
++ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
+ MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x130b0
+ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
+ MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
@@ -231,10 +232,11 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ >;
+ };
+};
-Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-===================================================================
+diff --git a/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts b/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+new file mode 100644
+index 0000000..1a542d1
--- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ b/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -487,3 +489,6 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ >;
+ };
+};
+--
+2.7.3
+
diff --git a/patches/linux/4.9/0803-armadeus-brcmfmac-increase-boot-timeout.patch b/patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch
similarity index 100%
copy from patches/linux/4.9/0803-armadeus-brcmfmac-increase-boot-timeout.patch
copy to patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch
hooks/post-receive
--
armadeus
|