[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-69-gfece9d3c5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-69-gfece9d3c5
|
From: Sébastien S. <ss...@us...> - 2019-05-28 07:53:10
|
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 fece9d3c5f2dd35b1da5b9e0d7a927cafdf4e822 (commit)
via 76cf7d0d0d56cd03b2b5b168b82e0652024de014 (commit)
from c269dbf66b8292f37aa423b3b2e37fcc6ca14dbe (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 fece9d3c5f2dd35b1da5b9e0d7a927cafdf4e822
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 28 09:51:02 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.46
commit 76cf7d0d0d56cd03b2b5b168b82e0652024de014
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 28 09:45:58 2019 +0200
[LINUX] 4.19: opos6ulsp: dts: add PWM1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 4 +--
.../armadeus/opos6ulsp/opos6ulsp-linux-4.19.config | 1 +
...rmadeus-opos6ul_sp-opos6ul_sp_dev-support.patch | 31 +++++++++++++++-------
5 files changed, 26 insertions(+), 14 deletions(-)
create mode 120000 buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-4.19.config
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 33d32fec9..85578e45f 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,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.19.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.46"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 6fcdb8633..2863f065e 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,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.19.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.46"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.17.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index f9ae1028f..177a85ef8 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,10 +22,10 @@ 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.17.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.46"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.17"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.17.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulspdev imx6ull-opos6ulspdev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-4.19.config b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-4.19.config
new file mode 120000
index 000000000..d21033514
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-4.19.config
@@ -0,0 +1 @@
+../opos6ul/opos6ul-linux-4.19.config
\ No newline at end of file
diff --git a/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch b/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
index 204c26819..ba2faef11 100644
--- a/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
+++ b/patches/linux/4.19/0111-armadeus-opos6ul_sp-opos6ul_sp_dev-support.patch
@@ -1,7 +1,7 @@
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
===================================================================
--- /dev/null
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
++++ linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -237,11 +237,11 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulsp.dtsi
+ >;
+ };
+};
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
-@@ -0,0 +1,268 @@
++++ linux-4.19.46/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+@@ -0,0 +1,279 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
@@ -389,6 +389,12 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ };
+};
+
++&pwm1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm1>;
++ status = "okay";
++};
++
+&pwm2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm2>;
@@ -444,7 +450,6 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+
+ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x1b0b0
+ MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x1b0b0
+ MX6UL_PAD_ENET2_TX_CLK__GPIO2_IO14 0x1b0b0
+ MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15 0x1b0b0
@@ -495,6 +500,12 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ >;
+ };
+
++ pinctrl_pwm1: pwm1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x1b0b0
++ >;
++ };
++
+ pinctrl_pwm2: pwm2grp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO09__PWM2_OUT 0x1b0b0
@@ -510,10 +521,10 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+ >;
+ };
+};
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+Index: linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
===================================================================
--- /dev/null
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
++++ linux-4.19.46/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -571,10 +582,10 @@ Index: linux-4.17.19/arch/arm/boot/dts/imx6ul-opos6ulspdev.dts
+ model = "Armadeus Systems OPOS6UL SP SoM (i.MX6UL) on OPOS6ULSPDev board";
+ compatible = "armadeus,opos6ulspdev", "armadeus,opos6ulsp", "fsl,imx6ul";
+};
-Index: linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
+Index: linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
===================================================================
--- /dev/null
-+++ linux-4.17.19/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
++++ linux-4.19.46/arch/arm/boot/dts/imx6ull-opos6ulspdev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
hooks/post-receive
--
armadeus
|