armadeus-commitlog Mailing List for armadeus (Page 21)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2018-05-17 09:31:35
|
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 f0d7625b54158b57f9af703d69ac51f0dc73e96a (commit)
from d72a6c38879ff22bbb9d94bd367e88627d00d018 (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 f0d7625b54158b57f9af703d69ac51f0dc73e96a
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu May 17 11:28:54 2018 +0200
[BSP] remove 2018.02.1 symlink
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2018.02.1 | 1 -
1 file changed, 1 deletion(-)
delete mode 120000 patches/buildroot/2018.02.1
diff --git a/patches/buildroot/2018.02.1 b/patches/buildroot/2018.02.1
deleted file mode 120000
index dd4d165d6..000000000
--- a/patches/buildroot/2018.02.1
+++ /dev/null
@@ -1 +0,0 @@
-2018.02
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-05-17 07:36:29
|
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 d72a6c38879ff22bbb9d94bd367e88627d00d018 (commit)
from b9e2a907bc317ab7f70096e2ea70735ae151834e (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 d72a6c38879ff22bbb9d94bd367e88627d00d018
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu May 17 09:46:52 2018 +0200
[LINUX] opos6ul: bump to 4.17-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 4 ++--
.../0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch | 0
.../0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch | 0
.../0102-ARM-dts-imx6ull-add-operating-points.patch | 0
.../0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch | 0
.../{4.17-rc1 => 4.17}/0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
.../0514-armadeus-remove-spidev-oops-warning-at-load-time.patch | 0
.../{4.17-rc1 => 4.17}/0703-armadeus-mxs-uart-add-rs485-support.patch | 0
.../0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch | 0
.../0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch | 0
.../0803-armadeus-brcmfmac-increase-boot-timeout.patch | 0
11 files changed, 2 insertions(+), 2 deletions(-)
rename patches/linux/{4.17-rc1 => 4.17}/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0102-ARM-dts-imx6ull-add-operating-points.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0703-armadeus-mxs-uart-add-rs485-support.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch (100%)
rename patches/linux/{4.17-rc1 => 4.17}/0803-armadeus-brcmfmac-increase-boot-timeout.patch (100%)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 423a02cd1..7e85da45d 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,8 +23,8 @@ 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-rc1"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.17-rc1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17-rc5"
+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_DTS_SUPPORT=y
diff --git a/patches/linux/4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch b/patches/linux/4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
rename to patches/linux/4.17/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
diff --git a/patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch b/patches/linux/4.17/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
rename to patches/linux/4.17/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
diff --git a/patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch b/patches/linux/4.17/0102-ARM-dts-imx6ull-add-operating-points.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch
rename to patches/linux/4.17/0102-ARM-dts-imx6ull-add-operating-points.patch
diff --git a/patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch b/patches/linux/4.17/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
rename to patches/linux/4.17/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
diff --git a/patches/linux/4.17-rc1/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/4.17/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0505-armadeus-add_mcp7940x_rtc_driver.patch
rename to patches/linux/4.17/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/4.17-rc1/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/4.17/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
rename to patches/linux/4.17/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
diff --git a/patches/linux/4.17-rc1/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/4.17/0703-armadeus-mxs-uart-add-rs485-support.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0703-armadeus-mxs-uart-add-rs485-support.patch
rename to patches/linux/4.17/0703-armadeus-mxs-uart-add-rs485-support.patch
diff --git a/patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch b/patches/linux/4.17/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
rename to patches/linux/4.17/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
diff --git a/patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch b/patches/linux/4.17/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
rename to patches/linux/4.17/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
diff --git a/patches/linux/4.17-rc1/0803-armadeus-brcmfmac-increase-boot-timeout.patch b/patches/linux/4.17/0803-armadeus-brcmfmac-increase-boot-timeout.patch
similarity index 100%
rename from patches/linux/4.17-rc1/0803-armadeus-brcmfmac-increase-boot-timeout.patch
rename to patches/linux/4.17/0803-armadeus-brcmfmac-increase-boot-timeout.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-05-16 14:47:05
|
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 b9e2a907bc317ab7f70096e2ea70735ae151834e (commit)
from 4f0f07ad922f151188b6db115fdcf1ccd50467a2 (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 b9e2a907bc317ab7f70096e2ea70735ae151834e
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 16 16:56:20 2018 +0200
[UBOOT] opos6ul: bump to 2018.05
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index eea9dc556..423a02cd1 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -132,7 +132,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="c531e4a7e1ceb2f32ff8c73e6c4ddeb02ed51724"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="68a4ad891043c40a8f29a5aaa593ec49d30f30d4"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2018-05-03 17:59:30
|
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 4f0f07ad922f151188b6db115fdcf1ccd50467a2 (commit)
from 1e01dc8452427f29665ec428b70031f39ae137ba (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 4f0f07ad922f151188b6db115fdcf1ccd50467a2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu May 3 19:57:19 2018 +0200
[BUILDROOT] 2017.02: remove some files when bumping from 2017.02.5 to 2017.02.10
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2017.02/cleanup_buildroot.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 442a01b..c4396fa 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -78,6 +78,10 @@ rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
rm -rf buildroot/package/libqmi/libqmi.hash
rm -rf buildroot/package/libqmi/libqmi.mk
+# For 2017.02.5 -> 2017.02.10 bump
+rm -rf buildroot/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch
+rm -rf buildroot/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch
+#
rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2018-04-24 13:03:22
|
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 1e01dc8452427f29665ec428b70031f39ae137ba (commit)
from 4b0f30cd86c581a9b3c0ff3830b1dade16bdb2a1 (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 1e01dc8452427f29665ec428b70031f39ae137ba
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Apr 24 15:02:14 2018 +0200
[BUILDROOT] 2017.02: bump to 2017.02.11
-----------------------------------------------------------------------
Summary of changes:
Makefile | 5 +-
patches/buildroot/2017.02.5 | 1 -
...stream-patch-to-fix-startup-hang-with-wit.patch | 139 ---------------------
3 files changed, 3 insertions(+), 142 deletions(-)
delete mode 120000 patches/buildroot/2017.02.5
delete mode 100644 patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
diff --git a/Makefile b/Makefile
index 7ebbfab..e1a58b8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,11 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_VERSION=2017.02.5
+BUILDROOT_MAJOR_VERSION=2017.02
+BUILDROOT_VERSION=$(BUILDROOT_MAJOR_VERSION).11
include ./Makefile.in
BUILDROOT_SITE:=https://buildroot.org/downloads
-BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION)
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
diff --git a/patches/buildroot/2017.02.5 b/patches/buildroot/2017.02.5
deleted file mode 120000
index e9fe20f..0000000
--- a/patches/buildroot/2017.02.5
+++ /dev/null
@@ -1 +0,0 @@
-2017.02
\ No newline at end of file
diff --git a/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch b/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
deleted file mode 100644
index 9f4dad4..0000000
--- a/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 515df8f93851d0c9556d7add5422041e2e5a1ae7 Mon Sep 17 00:00:00 2001
-From: Marcus Hoffmann <m.h...@ca...>
-Date: Fri, 4 Aug 2017 18:58:32 +0200
-Subject: [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang
- with with expat >= 2.2.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-After c0ad6ded018ffbc33f7f5 expat: security bump to version 2.2.1
-the system can hang on startup under certain circumstances.
-
-This happens when:
- * we use systemd as init system
- * the random nonblocking pool takes a while to initialize
- * this apparently doesn't happen on qemu, so this would not have
- been caught by the runtime testing infrastructure
- * it also doesn't seem to happen when network booting
-
-For a more detailed description of the bug see here:
-https://bugs.freedesktop.org/show_bug.cgi?id=101858
-
-The patch should be in next dbus version 1.10.24
-
-Set DBUS_AUTORECONF = YES because configure.ac is changed.
-
-Signed-off-by: Marcus Hoffmann <m.h...@ca...>
-[Arnout: add upstream commit sha + Marcus's Sob to the patch]
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
-(cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04)
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- ...er-expat-Tell-Expat-not-to-defend-against.patch | 78 ++++++++++++++++++++++
- package/dbus/dbus.mk | 3 +
- 2 files changed, 81 insertions(+)
- create mode 100644 package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-
-diff --git a/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-new file mode 100644
-index 0000000..fd9e01d
---- /dev/null
-+++ b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-@@ -0,0 +1,78 @@
-+From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001
-+From: Simon McVittie <sm...@de...>
-+Date: Fri, 21 Jul 2017 10:46:39 +0100
-+Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against
-+ hash collisions
-+
-+By default, Expat uses cryptographic-quality random numbers as a salt for
-+its hash algorithm, and since 2.2.1 it gets them from the getrandom
-+syscall on Linux. That syscall refuses to return any entropy until the
-+kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
-+can take as long as 40 seconds on embedded devices with few entropy
-+sources, which is too long: if the system dbus-daemon blocks for that
-+length of time, important D-Bus clients like systemd and systemd-logind
-+time out and fail to connect to it.
-+
-+We're parsing small configuration files here, and we trust them
-+completely, so we don't need to defend against hash collisions: nobody
-+is going to be crafting them to cause pathological performance.
-+
-+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
-+Signed-off-by: Simon McVittie <sm...@de...>
-+Tested-by: Christopher Hewitt <he...@ie...>
-+Reviewed-by: Philip Withnall <wit...@en...>
-+
-+Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
-+Signed-off-by: Marcus Hoffmann <m.h...@ca...>
-+---
-+ bus/config-loader-expat.c | 14 ++++++++++++++
-+ configure.ac | 8 ++++++++
-+ 2 files changed, 22 insertions(+)
-+
-+diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
-+index b571fda3..27cbe2d0 100644
-+--- a/bus/config-loader-expat.c
-++++ b/bus/config-loader-expat.c
-+@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file,
-+ goto failed;
-+ }
-+
-++ /* We do not need protection against hash collisions (CVE-2012-0876)
-++ * because we are only parsing trusted XML; and if we let Expat block
-++ * waiting for the CSPRNG to be initialized, as it does by default to
-++ * defeat CVE-2012-0876, it can cause timeouts during early boot on
-++ * entropy-starved embedded devices.
-++ *
-++ * TODO: When Expat gets a more explicit API for this than
-++ * XML_SetHashSalt, check for that too, and use it preferentially.
-++ * https://github.com/libexpat/libexpat/issues/91 */
-++#if defined(HAVE_XML_SETHASHSALT)
-++ /* Any nonzero number will do. https://xkcd.com/221/ */
-++ XML_SetHashSalt (expat, 4);
-++#endif
-++
-+ if (!_dbus_string_get_dirname (file, &dirname))
-+ {
-+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-+diff --git a/configure.ac b/configure.ac
-+index 52da11fb..c4022ed7 100644
-+--- a/configure.ac
-++++ b/configure.ac
-+@@ -938,6 +938,14 @@ XML_CFLAGS=
-+ AC_SUBST([XML_CFLAGS])
-+ AC_SUBST([XML_LIBS])
-+
-++save_cflags="$CFLAGS"
-++save_libs="$LIBS"
-++CFLAGS="$CFLAGS $XML_CFLAGS"
-++LIBS="$LIBS $XML_LIBS"
-++AC_CHECK_FUNCS([XML_SetHashSalt])
-++CFLAGS="$save_cflags"
-++LIBS="$save_libs"
-++
-+ # Thread lib detection
-+ AC_ARG_VAR([THREAD_LIBS])
-+ save_libs="$LIBS"
-+--
-+2.11.0
-+
-diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
-index e05fbff..f2974f2 100644
---- a/package/dbus/dbus.mk
-+++ b/package/dbus/dbus.mk
-@@ -6,6 +6,9 @@
-
- DBUS_VERSION = 1.10.22
- DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
-+
-+# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-+DBUS_AUTORECONF = YES
- DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
- DBUS_LICENSE_FILES = COPYING
- DBUS_INSTALL_STAGING = YES
---
-2.7.3
-
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2018-04-23 11:55: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 4b0f30cd86c581a9b3c0ff3830b1dade16bdb2a1 (commit)
from 918489b0ab18393960d9822046648cba7af60e00 (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 4b0f30cd86c581a9b3c0ff3830b1dade16bdb2a1
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Apr 23 13:53:38 2018 +0200
[BUILDROOT] opos6ulnano/genimage.cfg: do not populate failsafe partition with default rootfs as it may oversize it
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/opos6ulnano/genimage.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/target/device/armadeus/opos6ulnano/genimage.cfg b/buildroot/target/device/armadeus/opos6ulnano/genimage.cfg
index 62e250a..2bba487 100644
--- a/buildroot/target/device/armadeus/opos6ulnano/genimage.cfg
+++ b/buildroot/target/device/armadeus/opos6ulnano/genimage.cfg
@@ -10,7 +10,7 @@ image opos6ulnano-user_data.ext4 {
partition failsafe {
partition-type = 0x83
offset = 1M
- image = "rootfs.ext4"
+# image = "rootfs.ext4"
size = 128M
}
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-04-20 07:04:49
|
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 918489b0ab18393960d9822046648cba7af60e00 (commit)
from 4921341a682ec943ff73ccccdbd91b2f54e056a3 (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 918489b0ab18393960d9822046648cba7af60e00
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 20 09:14:54 2018 +0200
[TOOLS] opos6ul: update uboot binaries
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/opos6ul-u-boot.img | Bin 267528 -> 394288 bytes
software/uboot_recover/opos6ul-u-boot.spl | Bin 39936 -> 64512 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/software/uboot_recover/opos6ul-u-boot.img b/software/uboot_recover/opos6ul-u-boot.img
index dfa97f6..5d2fb08 100644
Binary files a/software/uboot_recover/opos6ul-u-boot.img and b/software/uboot_recover/opos6ul-u-boot.img differ
diff --git a/software/uboot_recover/opos6ul-u-boot.spl b/software/uboot_recover/opos6ul-u-boot.spl
index 3af985b..38a9bca 100644
Binary files a/software/uboot_recover/opos6ul-u-boot.spl and b/software/uboot_recover/opos6ul-u-boot.spl differ
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-04-20 06:57:16
|
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 4921341a682ec943ff73ccccdbd91b2f54e056a3 (commit)
via 5c43c4f251647fd48100c0bc6f7a376bbe077c85 (commit)
via e369271b463395ed11da429e4dda977303c48eba (commit)
via 01aa4762ae14c3afc7bdfde2f4050ba4cc77c6d4 (commit)
from 02bd745f0d86e383abe195c2f0499903b09eb895 (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 4921341a682ec943ff73ccccdbd91b2f54e056a3
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 20 09:06:12 2018 +0200
[UBOOT] opos6ul: bump to 2018.05-rc2
commit 5c43c4f251647fd48100c0bc6f7a376bbe077c85
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 20 08:44:15 2018 +0200
[LINUX] opos6ul: bump to 4.17-rc1
commit e369271b463395ed11da429e4dda977303c48eba
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 20 08:18:20 2018 +0200
[BUILDROOT] fix URL for -rc kernel
commit 01aa4762ae14c3afc7bdfde2f4050ba4cc77c6d4
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 20 08:16:21 2018 +0200
[BUILDROOT] 2017.02: rootfs: just disable ext4 64bit feature
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 14 +-
.../opos6ul-linux-4.17.config} | 1 -
...mke2img-use-mkfs-to-generate-rootfs-image.patch | 4 +-
...ux-Fix-URL-for-release-candidate-versions.patch | 43 +
patches/buildroot/2017.02/cleanup_buildroot.sh | 6 +-
...6ul-rework-device-tree-to-support-i.MX6U.patch} | 912 ++++++++++-----------
...req-imx6q-check-speed-grades-for-i.MX6ULL.patch | 79 ++
...0102-ARM-dts-imx6ull-add-operating-points.patch | 51 ++
...ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch | 30 +
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
...s-remove-spidev-oops-warning-at-load-time.patch | 0
.../0703-armadeus-mxs-uart-add-rs485-support.patch | 0
...armadeus-dts-opos6uldev-LQ043-LCD-support.patch | 12 +-
...rmadeus-dts-opos6uldev-add-csi-pin-muxing.patch | 8 +-
...3-armadeus-brcmfmac-increase-boot-timeout.patch | 0
15 files changed, 674 insertions(+), 486 deletions(-)
copy buildroot/target/device/armadeus/{opos6ulnano/opos6ulnano-linux-4.9.config => opos6ul/opos6ul-linux-4.17.config} (99%)
create mode 100644 patches/buildroot/2017.02/231-linux-Fix-URL-for-release-candidate-versions.patch
copy patches/linux/{4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch => 4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch} (88%)
create mode 100644 patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
create mode 100644 patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch
create mode 100644 patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
copy patches/linux/{4.14 => 4.17-rc1}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
copy patches/linux/{4.14 => 4.17-rc1}/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch (100%)
copy patches/linux/{4.14 => 4.17-rc1}/0703-armadeus-mxs-uart-add-rs485-support.patch (100%)
copy patches/linux/{4.14 => 4.17-rc1}/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch (70%)
copy patches/linux/{4.14 => 4.17-rc1}/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch (79%)
copy patches/linux/{4.14 => 4.17-rc1}/0803-armadeus-brcmfmac-increase-boot-timeout.patch (100%)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index ed85481..eea9dc5 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,10 +23,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.14.19"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17-rc1"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.17-rc1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.14.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.17.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -132,9 +132,11 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="e026b020579847d2088df445a1ec43f17b45f981"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ul"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="c531e4a7e1ceb2f32ff8c73e6c4ddeb02ed51724"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
BR2_PACKAGE_HOST_E2TOOLS=y
diff --git a/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-4.9.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
similarity index 99%
copy from buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-4.9.config
copy to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
index 19cf0fb..e5b7262 100644
--- a/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-4.9.config
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
@@ -32,7 +32,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
diff --git a/patches/buildroot/2017.02/227-package-mke2img-use-mkfs-to-generate-rootfs-image.patch b/patches/buildroot/2017.02/227-package-mke2img-use-mkfs-to-generate-rootfs-image.patch
index a30944f..a0c6a53 100644
--- a/patches/buildroot/2017.02/227-package-mke2img-use-mkfs-to-generate-rootfs-image.patch
+++ b/patches/buildroot/2017.02/227-package-mke2img-use-mkfs-to-generate-rootfs-image.patch
@@ -68,7 +68,7 @@ Index: buildroot/package/mke2img/mke2img
fi
+ # Disable some defaults features
-+ mkfs_O_opts+=",^ext_attr,^64bit,^flex_bg,^large_file,^huge_file,^dir_nlink,^extra_isize"
++ mkfs_O_opts+=",^64bit"
+
# Add our -O options (there will be at most one leading comma, remove it)
- if [ -n "${tune2fs_O_opts}" ]; then
@@ -137,7 +137,7 @@ Index: buildroot/package/mke2img/mke2img
- # issues by tremendously slowing down the boot.
- tune2fs -c 0 -i 0 "${image}"
+ # Generate the filesystem
-+ mkfs_opts+=( -d "${root_dir}" -N ${nb_inodes} -T small -F )
++ mkfs_opts+=( -d "${root_dir}" -N ${nb_inodes} -F )
+ if [ -n "${nb_res_blocks}" ]; then
+ mkfs_opts+=( -m ${nb_res_blocks} )
+ fi
diff --git a/patches/buildroot/2017.02/231-linux-Fix-URL-for-release-candidate-versions.patch b/patches/buildroot/2017.02/231-linux-Fix-URL-for-release-candidate-versions.patch
new file mode 100644
index 0000000..5d9b01a
--- /dev/null
+++ b/patches/buildroot/2017.02/231-linux-Fix-URL-for-release-candidate-versions.patch
@@ -0,0 +1,43 @@
+From ff4cccbdcf5417a5a8c251ff302791a306023cc1 Mon Sep 17 00:00:00 2001
+From: Luis Araneda <lua...@gm...>
+Date: Thu, 10 Aug 2017 23:50:35 -0400
+Subject: [PATCH] linux: Fix URL for release candidate versions
+
+Starting with 4.12-rc1, tarballs are generated by cgit directly from
+Linus's tree. This also implies that no .tar.xz can be used for them.
+
+This method also applies to older release candidates.
+
+Signed-off-by: Luis Araneda <lua...@gm...>
+[Arnout: added comment in the code]
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
+---
+ linux/linux.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -30,6 +30,10 @@ LINUX_SITE_METHOD = hg
+ else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y)
+ LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
+ LINUX_SITE_METHOD = svn
++else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
++# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
++# older -rc kernels.
++LINUX_SITE = https://git.kernel.org/torvalds/t
+ else
+ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
+ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
+@@ -45,10 +49,6 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/
+ else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+ endif
+-# release candidates are in testing/ subdir
+-ifneq ($(findstring -rc,$(LINUX_VERSION)),)
+-LINUX_SITE := $(LINUX_SITE)/testing
+-endif # -rc
+ endif
+
+ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index c83cc6c..442a01b 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -15,8 +15,11 @@ rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/abootimg/
+rm -rf buildroot/package/abootimg/Config.in
+rm -rf buildroot/package/abootimg/abootimg.hash
+rm -rf buildroot/package/abootimg/abootimg.mk
rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/agg/agg.mk
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
@@ -44,7 +47,6 @@ rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
rm -rf buildroot/package/freescale-imx/Config.in
-rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
diff --git a/patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch b/patches/linux/4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
similarity index 88%
copy from patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch
copy to patches/linux/4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
index 8ca3210..c064b5c 100644
--- a/patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch
+++ b/patches/linux/4.17-rc1/0100-ARM-dts-opos6ul-rework-device-tree-to-support-i.MX6U.patch
@@ -1,7 +1,49 @@
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-===================================================================
---- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+From b48b0dd7ec2af0ce79b99986bf41a5e5ae0955cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 18 Apr 2018 13:48:53 +0200
+Subject: [PATCH 100/103] ARM: dts: opos6ul: rework device tree to support
+ i.MX6ULL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Rework the device tree of the OPOS6ULDEV board to support the OPOS6UL
+SoM with an i.MX6ULL SoC.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/Makefile | 3 +-
+ ...ul-opos6ul.dtsi => imx6ul-imx6ull-opos6ul.dtsi} | 4 +-
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 406 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6ul-opos6uldev.dts | 366 +------------------
+ arch/arm/boot/dts/imx6ull-opos6uldev.dts | 56 +++
+ 5 files changed, 470 insertions(+), 365 deletions(-)
+ rename arch/arm/boot/dts/{imx6ul-opos6ul.dtsi => imx6ul-imx6ull-opos6ul.dtsi} (98%)
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 7e2424957809..eb5ed60b92a2 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -538,7 +538,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+ imx6ul-tx6ul-mainboard.dtb \
+ imx6ull-14x14-evk.dtb \
+ imx6ull-colibri-eval-v3.dtb \
+- imx6ull-colibri-wifi-eval-v3.dtb
++ imx6ull-colibri-wifi-eval-v3.dtb \
++ imx6ull-opos6uldev.dtb
+ dtb-$(CONFIG_SOC_IMX7D) += \
+ imx7d-cl-som-imx7.dtb \
+ imx7d-colibri-emmc-eval-v3.dtb \
+diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+similarity index 98%
+rename from arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+rename to arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+index a031bee311df..a4621f3688e3 100644
+--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -16,429 +58,15 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-#include "imx6ul.dtsi"
-
/ {
- memory {
+ memory@80000000 {
reg = <0x80000000 0>; /* will be filled by U-Boot */
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-===================================================================
---- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2017 Armadeus Systems <su...@ar...>
-+ * Copyright 2018 Armadeus Systems <su...@ar...>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
-@@ -46,400 +46,11 @@
- */
-
- /dts-v1/;
-+#include "imx6ul.dtsi"
- #include "imx6ul-opos6ul.dtsi"
-+#include "imx6ul-opos6uldev.dtsi"
-
- / {
-- model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
-+ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
- compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
--
-- chosen {
-- stdout-path = &uart1;
-- };
--
-- backlight {
-- compatible = "pwm-backlight";
-- pwms = <&pwm3 0 191000>;
-- brightness-levels = <0 4 8 16 32 64 128 255>;
-- default-brightness-level = <7>;
-- power-supply = <®_5v>;
-- status = "okay";
-- };
--
-- gpio-keys {
-- compatible = "gpio-keys";
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_gpio_keys>;
--
-- user-button {
-- label = "User button";
-- gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
-- linux,code = <BTN_MISC>;
-- wakeup-source;
-- };
-- };
--
-- leds {
-- compatible = "gpio-leds";
--
-- user-led {
-- label = "User";
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_led>;
-- gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-- linux,default-trigger = "heartbeat";
-- };
-- };
--
-- onewire {
-- compatible = "w1-gpio";
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_w1>;
-- gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
-- };
--
-- reg_5v: regulator-5v {
-- compatible = "regulator-fixed";
-- regulator-name = "5V";
-- regulator-min-microvolt = <5000000>;
-- regulator-max-microvolt = <5000000>;
-- };
--
-- reg_usbotg1_vbus: regulator-usbotg1vbus {
-- compatible = "regulator-fixed";
-- regulator-name = "usbotg1vbus";
-- regulator-min-microvolt = <5000000>;
-- regulator-max-microvolt = <5000000>;
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usbotg1_vbus>;
-- gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
-- enable-active-high;
-- };
--
-- reg_usbotg2_vbus: regulator-usbotg2vbus {
-- compatible = "regulator-fixed";
-- regulator-name = "usbotg2vbus";
-- regulator-min-microvolt = <5000000>;
-- regulator-max-microvolt = <5000000>;
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usbotg2_vbus>;
-- gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
-- enable-active-high;
-- };
--};
--
--&adc1 {
-- vref-supply = <®_3v3>;
-- status = "okay";
--};
--
--&can1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_flexcan1>;
-- xceiver-supply = <®_5v>;
-- status = "okay";
--};
--
--&can2 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_flexcan2>;
-- xceiver-supply = <®_5v>;
-- status = "okay";
--};
--
--&ecspi4 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_ecspi4>;
-- cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
-- status = "okay";
--
-- spidev0: spi@0 {
-- compatible = "spidev";
-- reg = <0>;
-- spi-max-frequency = <5000000>;
-- };
--
-- spidev1: spi@1 {
-- compatible = "spidev";
-- reg = <1>;
-- spi-max-frequency = <5000000>;
-- };
--};
--
--&i2c1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c1>;
-- clock_frequency = <400000>;
-- status = "okay";
--};
--
--&i2c2 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_i2c2>;
-- clock_frequency = <400000>;
-- status = "okay";
--};
--
--&lcdif {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_lcdif>;
-- display = <&display0>;
-- lcd-supply = <®_3v3>;
-- status = "okay";
--
-- display0: display0 {
-- bits-per-pixel = <32>;
-- bus-width = <18>;
--
-- display-timings {
-- ST0700 {
-- clock-frequency = <33000033>;
-- hactive = <800>;
-- vactive = <480>;
-- hback-porch = <96>;
-- hfront-porch = <96>;
-- vback-porch = <20>;
-- vfront-porch = <21>;
-- hsync-len = <64>;
-- vsync-len = <4>;
-- 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>;
-- };
-- };
-- };
--};
--
--&pwm3 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_pwm3>;
-- status = "okay";
--};
--
--&snvs_pwrkey {
-- status = "disabled";
--};
--
--&tsc {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_tsc>;
-- xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
-- measure-delay-time = <0xffff>;
-- pre-charge-time = <0xffff>;
-- status = "okay";
--};
--
--&uart1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart1>;
-- status = "okay";
--};
--
--&uart2 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_uart2>;
-- status = "okay";
--};
--
--&usbotg1 {
-- pinctrl-names = "default";
-- pinctrl-0 = <&pinctrl_usbotg1_id>;
-- vbus-supply = <®_usbotg1_vbus>;
-- dr_mode = "otg";
-- disable-over-current;
-- status = "okay";
--};
--
--&usbotg2 {
-- vbus-supply = <®_usbotg2_vbus>;
-- dr_mode = "host";
-- disable-over-current;
-- status = "okay";
--};
--
--&iomuxc {
-- 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
-- MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
-- MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
-- MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
-- MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
-- >;
-- };
--
-- pinctrl_flexcan1: flexcan1grp {
-- fsl,pins = <
-- MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
-- MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
-- >;
-- };
--
-- pinctrl_flexcan2: flexcan2grp {
-- fsl,pins = <
-- MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
-- MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
-- >;
-- };
--
-- pinctrl_gpios: gpiosgrp {
-- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
-- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
-- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
-- MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
-- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
-- MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
-- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
-- MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
-- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
-- >;
-- };
--
-- pinctrl_gpio_keys: gpiokeysgrp {
-- fsl,pins = <
-- MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
-- >;
-- };
--
-- pinctrl_i2c1: i2c1grp {
-- fsl,pins = <
-- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
-- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
-- >;
-- };
--
-- pinctrl_i2c2: i2c2grp {
-- fsl,pins = <
-- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
-- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
-- >;
-- };
--
-- pinctrl_lcdif: lcdifgrp {
-- fsl,pins = <
-- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
-- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
-- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
-- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
-- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
-- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
-- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
-- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
-- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
-- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
-- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
-- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
-- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
-- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
-- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
-- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
-- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
-- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
-- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
-- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
-- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
-- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
-- >;
-- };
--
-- pinctrl_led: ledgrp {
-- fsl,pins = <
-- MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
-- >;
-- };
--
-- pinctrl_pwm3: pwm3grp {
-- fsl,pins = <
-- MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
-- >;
-- };
--
-- pinctrl_tsc: tscgrp {
-- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
-- MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
-- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
-- MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
-- >;
-- };
--
-- pinctrl_uart1: uart1grp {
-- fsl,pins = <
-- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
-- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
-- >;
-- };
--
-- pinctrl_uart2: uart2grp {
-- fsl,pins = <
-- MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
-- MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
-- >;
-- };
--
-- pinctrl_usbotg1_id: usbotg1idgrp {
-- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
-- >;
-- };
--
-- pinctrl_usbotg1_vbus: usbotg1vbusgrp {
-- fsl,pins = <
-- MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
-- >;
-- };
--
-- pinctrl_usbotg2_vbus: usbotg2vbusgrp {
-- fsl,pins = <
-- MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
-- >;
-- };
--
-- pinctrl_w1: w1grp {
-- fsl,pins = <
-- MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
-- >;
-- };
- };
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
-===================================================================
---- /dev/null
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
-@@ -0,0 +1,439 @@
-+/*
+diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+new file mode 100644
+index 000000000000..0b79a246a07f
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -0,0 +1,406 @@
++/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
@@ -625,7 +253,7 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
+ bus-width = <18>;
+
+ display-timings {
-+ ST0700 {
++ timing0: timing0 {
+ clock-frequency = <33000033>;
+ hactive = <800>;
+ vactive = <480>;
@@ -638,22 +266,6 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
+ 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>;
-+ };
+ };
+ };
+};
@@ -709,23 +321,6 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
+ 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
@@ -877,10 +472,394 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
+ >;
+ };
+};
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6uldev.dts
-===================================================================
+diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+index 0e59ee57fd55..3ad25a9de4d4 100644
+--- a/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+@@ -46,367 +46,11 @@
+ */
+
+ /dts-v1/;
+-#include "imx6ul-opos6ul.dtsi"
++#include "imx6ul.dtsi"
++#include "imx6ul-imx6ull-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev.dtsi"
+
+ / {
+- model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+-
+- chosen {
+- stdout-path = &uart1;
+- };
+-
+- backlight {
+- compatible = "pwm-backlight";
+- pwms = <&pwm3 0 191000>;
+- brightness-levels = <0 4 8 16 32 64 128 255>;
+- default-brightness-level = <7>;
+- power-supply = <®_5v>;
+- status = "okay";
+- };
+-
+- gpio-keys {
+- compatible = "gpio-keys";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_gpio_keys>;
+-
+- user-button {
+- label = "User button";
+- gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
+- linux,code = <BTN_MISC>;
+- wakeup-source;
+- };
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- user-led {
+- label = "User";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_led>;
+- gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+- linux,default-trigger = "heartbeat";
+- };
+- };
+-
+- onewire {
+- compatible = "w1-gpio";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_w1>;
+- gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+- };
+-
+- reg_5v: regulator-5v {
+- compatible = "regulator-fixed";
+- regulator-name = "5V";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- };
+-
+- reg_usbotg1_vbus: regulator-usbotg1vbus {
+- compatible = "regulator-fixed";
+- regulator-name = "usbotg1vbus";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg1_vbus>;
+- gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+- enable-active-high;
+- };
+-
+- reg_usbotg2_vbus: regulator-usbotg2vbus {
+- compatible = "regulator-fixed";
+- regulator-name = "usbotg2vbus";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg2_vbus>;
+- gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+- enable-active-high;
+- };
+-};
+-
+-&adc1 {
+- vref-supply = <®_3v3>;
+- status = "okay";
+-};
+-
+-&can1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_flexcan1>;
+- xceiver-supply = <®_5v>;
+- status = "okay";
+-};
+-
+-&can2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_flexcan2>;
+- xceiver-supply = <®_5v>;
+- status = "okay";
+-};
+-
+-&ecspi4 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ecspi4>;
+- cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
+- status = "okay";
+-
+- spidev0: spi@0 {
+- compatible = "spidev";
+- reg = <0>;
+- spi-max-frequency = <5000000>;
+- };
+-
+- spidev1: spi@1 {
+- compatible = "spidev";
+- reg = <1>;
+- spi-max-frequency = <5000000>;
+- };
+-};
+-
+-&i2c1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c1>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&lcdif {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_lcdif>;
+- display = <&display0>;
+- lcd-supply = <®_3v3>;
+- status = "okay";
+-
+- display0: display0 {
+- bits-per-pixel = <32>;
+- bus-width = <18>;
+-
+- display-timings {
+- timing0: timing0 {
+- clock-frequency = <33000033>;
+- hactive = <800>;
+- vactive = <480>;
+- hback-porch = <96>;
+- hfront-porch = <96>;
+- vback-porch = <20>;
+- vfront-porch = <21>;
+- hsync-len = <64>;
+- vsync-len = <4>;
+- de-active = <1>;
+- pixelclk-active = <0>;
+- };
+- };
+- };
+-};
+-
+-&pwm3 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_pwm3>;
+- status = "okay";
+-};
+-
+-&snvs_pwrkey {
+- status = "disabled";
+-};
+-
+-&tsc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_tsc>;
+- xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
+- measure-delay-time = <0xffff>;
+- pre-charge-time = <0xffff>;
+- status = "okay";
+-};
+-
+-&uart1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart1>;
+- status = "okay";
+-};
+-
+-&uart2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart2>;
+- status = "okay";
+-};
+-
+-&usbotg1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg1_id>;
+- vbus-supply = <®_usbotg1_vbus>;
+- dr_mode = "otg";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&usbotg2 {
+- vbus-supply = <®_usbotg2_vbus>;
+- dr_mode = "host";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_gpios>;
+-
+- pinctrl_ecspi4: ecspi4grp {
+- fsl,pins = <
+- MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
+- MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
+- MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
+- MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
+- MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+- >;
+- };
+-
+- pinctrl_flexcan1: flexcan1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
+- MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_flexcan2: flexcan2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
+- MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpios: gpiosgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
+- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
+- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
+- MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
+- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
+- MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
+- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
+- MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpio_keys: gpiokeysgrp {
+- fsl,pins = <
+- MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+- >;
+- };
+-
+- pinctrl_i2c1: i2c1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_lcdif: lcdifgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
+- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
+- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
+- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
+- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
+- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
+- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
+- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
+- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
+- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
+- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
+- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
+- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
+- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
+- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
+- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
+- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
+- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
+- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
+- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
+- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
+- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
+- >;
+- };
+-
+- pinctrl_led: ledgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
+- >;
+- };
+-
+- pinctrl_pwm3: pwm3grp {
+- fsl,pins = <
+- MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
+- >;
+- };
+-
+- pinctrl_tsc: tscgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
+- MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
+- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
+- MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
+- >;
+- };
+-
+- pinctrl_uart1: uart1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+- >;
+- };
+-
+- pinctrl_uart2: uart2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
+- >;
+- };
+-
+- pinctrl_usbotg1_id: usbotg1idgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
+- >;
+- };
+-
+- pinctrl_usbotg1_vbus: usbotg1vbusgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
+- >;
+- };
+-
+- pinctrl_usbotg2_vbus: usbotg2vbusgrp {
+- fsl,pins = <
+- MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
+- >;
+- };
+-
+- pinctrl_w1: w1grp {
+- fsl,pins = <
+- MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
+- >;
+- };
+ };
+diff --git a/arch/arm/boot/dts/imx6ull-opos6uldev.dts b/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+new file mode 100644
+index 000000000000..47fbe3e23489
--- /dev/null
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6uldev.dts
++++ b/arch/arm/boot/dts/imx6ull-opos6uldev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -931,10 +910,13 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+
+/dts-v1/;
+#include "imx6ull.dtsi"
-+#include "imx6ul-opos6ul.dtsi"
-+#include "imx6ul-opos6uldev.dtsi"
++#include "imx6ul-imx6ull-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev.dtsi"
+
+/ {
+ model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
+};
+--
+2.16.1
+
diff --git a/patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch b/patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
new file mode 100644
index 0000000..ed9171f
--- /dev/null
+++ b/patches/linux/4.17-rc1/0101-cpufreq-imx6q-check-speed-grades-for-i.MX6ULL.patch
@@ -0,0 +1,79 @@
+From 4bd24c66ad947cd4a7bb85a33e2b33ce93c6800c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 18 Apr 2018 15:54:44 +0200
+Subject: [PATCH 101/103] cpufreq: imx6q: check speed grades for i.MX6ULL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Check the max speed supported from the fuses for i.MX6ULL and update the
+operating points table accordingly.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/cpufreq/imx6q-cpufreq.c | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
+index 83cf631fc9bc..f094687cae52 100644
+--- a/drivers/cpufreq/imx6q-cpufreq.c
++++ b/drivers/cpufreq/imx6q-cpufreq.c
+@@ -266,6 +266,8 @@ static void imx6q_opp_check_speed_grading(struct device *dev)
+ }
+
+ #define OCOTP_CFG3_6UL_SPEED_696MHZ 0x2
++#define OCOTP_CFG3_6ULL_SPEED_792MHZ 0x2
++#define OCOTP_CFG3_6ULL_SPEED_900MHZ 0x3
+
+ static void imx6ul_opp_check_speed_grading(struct device *dev)
+ {
+@@ -287,16 +289,30 @@ static void imx6ul_opp_check_speed_grading(struct device *dev)
+ * Speed GRADING[1:0] defines the max speed of ARM:
+ * 2b'00: Reserved;
+ * 2b'01: 528000000Hz;
+- * 2b'10: 696000000Hz;
+- * 2b'11: Reserved;
++ * 2b'10: 696000000Hz on i.MX6UL, 792000000Hz on i.MX6ULL;
++ * 2b'11: 900000000Hz on i.MX6ULL only;
+ * We need to set the max speed of ARM according to fuse map.
+ */
+ val = readl_relaxed(base + OCOTP_CFG3);
+ val >>= OCOTP_CFG3_SPEED_SHIFT;
+ val &= 0x3;
+- if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
+- if (dev_pm_opp_disable(dev, 696000000))
+- dev_warn(dev, "failed to disable 696MHz OPP\n");
++
++ if (of_machine_is_compatible("fsl,imx6ul")) {
++ if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
++ if (dev_pm_opp_disable(dev, 696000000))
++ dev_warn(dev, "failed to disable 696MHz OPP\n");
++ }
++
++ if (of_machine_is_compatible("fsl,imx6ull")) {
++ if (val != OCOTP_CFG3_6ULL_SPEED_792MHZ)
++ if (dev_pm_opp_disable(dev, 792000000))
++ dev_warn(dev, "failed to disable 792MHz OPP\n");
++
++ if (val != OCOTP_CFG3_6ULL_SPEED_900MHZ)
++ if (dev_pm_opp_disable(dev, 900000000))
++ dev_warn(dev, "failed to disable 900MHz OPP\n");
++ }
++
+ iounmap(base);
+ put_node:
+ of_node_put(np);
+@@ -356,7 +372,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
+ goto put_reg;
+ }
+
+- if (of_machine_is_compatible("fsl,imx6ul"))
++ if (of_machine_is_compatible("fsl,imx6ul") ||
++ of_machine_is_compatible("fsl,imx6ull"))
+ imx6ul_opp_check_speed_grading(cpu_dev);
+ else
+ imx6q_opp_check_speed_grading(cpu_dev);
+--
+2.16.1
+
diff --git a/patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch b/patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch
new file mode 100644
index 0000000..0a6b5bb
--- /dev/null
+++ b/patches/linux/4.17-rc1/0102-ARM-dts-imx6ull-add-operating-points.patch
@@ -0,0 +1,51 @@
+From f6bc8e8f9e184efae476ccf1322082fa3d248bc3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 18 Apr 2018 16:02:39 +0200
+Subject: [PATCH 102/103] ARM: dts: imx6ull: add operating points
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+i.MX6ULL has different operating ranges than i.MX6UL so add the
+operating points for the i.MX6ULL. A 25mV offset is added to the minimum
+allowed values like for the i.MX6UL.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx6ull.dtsi | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
+index 571ddd71cdba..530d5526b890 100644
+--- a/arch/arm/boot/dts/imx6ull.dtsi
++++ b/arch/arm/boot/dts/imx6ull.dtsi
+@@ -46,6 +46,25 @@
+ /* Delete UART8 in AIPS-1 (i.MX6UL specific) */
+ /delete-node/ &uart8;
+
++&cpu0 {
++ operating-points = <
++ /* kHz uV */
++ 900000 1275000
++ 792000 1225000
++ 528000 1175000
++ 396000 1025000
++ 198000 950000
++ >;
++ fsl,soc-operating-points = <
++ /* KHz uV */
++ 900000 1175000
++ 792000 1175000
++ 528000 1175000
++ 396000 1175000
++ 198000 1175000
++ >;
++};
++
+ / {
+ soc {
+ aips3: aips-bus@2200000 {
+--
+2.16.1
+
diff --git a/patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch b/patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
new file mode 100644
index 0000000..39782ca
--- /dev/null
+++ b/patches/linux/4.17-rc1/0103-ARM-dts-opos6uldev-fix-pixel-clk-polarity.patch
@@ -0,0 +1,30 @@
+From db45b2905d8df5cd565009e48e07c492312116c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 19 Apr 2018 15:59:07 +0200
+Subject: [PATCH 103/103] ARM: dts: opos6uldev: fix pixel clk polarity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+index 0b79a246a07f..e4c3cc81d263 100644
+--- a/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -196,7 +196,7 @@
+ hsync-len = <64>;
+ vsync-len = <4>;
+ de-active = <1>;
+- pixelclk-active = <0>;
++ pixelclk-active = <1>;
+ };
+ };
+ };
+--
+2.16.1
+
diff --git a/patches/linux/4.14/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/4.17-rc1/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/4.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/4.17-rc1/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/4.14/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/4.17-rc1/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
similarity index 100%
copy from patches/linux/4.14/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
copy to patches/linux/4.17-rc1/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
diff --git a/patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/4.17-rc1/0703-armadeus-mxs-uart-add-rs485-support.patch
similarity index 100%
copy from patches/linux/4.14/0703-armadeus-mxs-uart-add-rs485-support.patch
copy to patches/linux/4.17-rc1/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.17-rc1/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
similarity index 70%
copy from patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
copy to patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
index 53e16b1..3d8630b 100644
--- a/patches/linux/4.14/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
+++ b/patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-LQ043-LCD-support.patch
@@ -1,9 +1,9 @@
Signed-off-by: Julien BOIBESSOT <jul...@ar...>
-Index: linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
===================================================================
---- 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 @@
+--- linux-4.17-rc1.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -185,7 +185,7 @@
bus-width = <18>;
display-timings {
@@ -12,9 +12,9 @@ Index: linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
clock-frequency = <33000033>;
hactive = <800>;
vactive = <480>;
-@@ -204,6 +204,22 @@
+@@ -198,6 +198,22 @@
de-active = <1>;
- pixelclk-active = <0>;
+ pixelclk-active = <1>;
};
+
+ LQ043 {
diff --git a/patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch b/patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
similarity index 79%
copy from patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
copy to patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
index de984a6..5c4a186 100644
--- a/patches/linux/4.14/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
+++ b/patches/linux/4.17-rc1/0800-armadeus-dts-opos6uldev-add-csi-pin-muxing.patch
@@ -1,9 +1,9 @@
Signed-off-by: Julien BOIBESSOT <jul...@ar...>
-Index: linux-4.14.17/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
===================================================================
---- 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 @@
+--- linux-4.17-rc1.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17-rc1/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -269,6 +269,23 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpios>;
diff --git a/patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch b/patches/linux/4.17-rc1/0803-armadeus-brcmfmac-increase-boot-timeout.patch
similarity index 100%
copy from patches/linux/4.14/0803-armadeus-brcmfmac-increase-boot-timeout.patch
copy to patches/linux/4.17-rc1/0803-armadeus-brcmfmac-increase-boot-timeout.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2018-04-16 14:51:42
|
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 02bd745f0d86e383abe195c2f0499903b09eb895 (commit)
from abfbc11207a224eb91baa75a7165451bff617deb (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 02bd745f0d86e383abe195c2f0499903b09eb895
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Apr 16 16:51:22 2018 +0200
[BUILDROOT] 2017.02/2018.02: forces unbuffer tool installation when expect package is selected
-----------------------------------------------------------------------
Summary of changes:
...madeus-expect-forces-unbuffer-instalation.patch | 23 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 1 +
...madeus-expect-forces-unbuffer-instalation.patch | 23 ++++++++++++++++++++++
patches/buildroot/2018.02/cleanup_buildroot.sh | 1 +
4 files changed, 48 insertions(+)
create mode 100644 patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
create mode 100644 patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
diff --git a/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
new file mode 100644
index 0000000..35297b2
--- /dev/null
+++ b/patches/buildroot/2017.02/044-armadeus-expect-forces-unbuffer-instalation.patch
@@ -0,0 +1,23 @@
+Forces unbuffer tool installation when expect package is selected and
+TCL shell interpreter is present.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/package/expect/expect.mk b/package/expect/expect.mk
+index d78ff6c..d88f00f 100644
+--- a/package/expect/expect.mk
++++ b/package/expect/expect.mk
+@@ -17,4 +17,13 @@ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+ # Since we don't want examples installed
+ EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
+
++# unbuffer requires TCL_SH interpreter
++ifneq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
++define EXPECT_INSTALL_UNBUFFER
++ $(INSTALL) -m 0755 -D $(@D)/example/unbuffer $(TARGET_DIR)/usr/bin/unbuffer
++endef
++
++EXPECT_POST_INSTALL_TARGET_HOOKS += EXPECT_INSTALL_UNBUFFER
++endif
++
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 3cfe48d..c83cc6c 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -40,6 +40,7 @@ rm -rf buildroot/package/dbus/dbus.hash
rm -rf buildroot/package/dbus/dbus.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
rm -rf buildroot/package/freescale-imx/Config.in
diff --git a/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
new file mode 100644
index 0000000..35297b2
--- /dev/null
+++ b/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
@@ -0,0 +1,23 @@
+Forces unbuffer tool installation when expect package is selected and
+TCL shell interpreter is present.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff --git a/package/expect/expect.mk b/package/expect/expect.mk
+index d78ff6c..d88f00f 100644
+--- a/package/expect/expect.mk
++++ b/package/expect/expect.mk
+@@ -17,4 +17,13 @@ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+ # Since we don't want examples installed
+ EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
+
++# unbuffer requires TCL_SH interpreter
++ifneq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
++define EXPECT_INSTALL_UNBUFFER
++ $(INSTALL) -m 0755 -D $(@D)/example/unbuffer $(TARGET_DIR)/usr/bin/unbuffer
++endef
++
++EXPECT_POST_INSTALL_TARGET_HOOKS += EXPECT_INSTALL_UNBUFFER
++endif
++
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2018.02/cleanup_buildroot.sh b/patches/buildroot/2018.02/cleanup_buildroot.sh
index 341ddba..ed39471 100755
--- a/patches/buildroot/2018.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2018.02/cleanup_buildroot.sh
@@ -37,6 +37,7 @@ rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
rm -rf buildroot/package/gnash/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-04-11 13:53:31
|
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 abfbc11207a224eb91baa75a7165451bff617deb (commit)
from aaa703d34a4bdf4110ef1a55bb5b2f930ef360ee (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 abfbc11207a224eb91baa75a7165451bff617deb
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 11 16:01:37 2018 +0200
[BSP] patches: buildroot: add 2018.02.x symlink
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2018.02.1 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 patches/buildroot/2018.02.1
diff --git a/patches/buildroot/2018.02.1 b/patches/buildroot/2018.02.1
new file mode 120000
index 0000000..dd4d165
--- /dev/null
+++ b/patches/buildroot/2018.02.1
@@ -0,0 +1 @@
+2018.02
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2018-04-05 13:59:56
|
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 aaa703d34a4bdf4110ef1a55bb5b2f930ef360ee (commit)
from 67d56d2d5fbdd12f5dffe452c650af576449f41d (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 aaa703d34a4bdf4110ef1a55bb5b2f930ef360ee
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 5 16:09:20 2018 +0200
[TOOLS] add opos6ulnano recovery support
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/opos6ulnano-u-boot.img | Bin 0 -> 383357 bytes
software/uboot_recover/opos6ulnano-u-boot.spl | Bin 0 -> 35840 bytes
.../{opos6ul_recovery.py => opos6ulnano_recovery.py} | 18 +++++++++---------
3 files changed, 9 insertions(+), 9 deletions(-)
create mode 100644 software/uboot_recover/opos6ulnano-u-boot.img
create mode 100644 software/uboot_recover/opos6ulnano-u-boot.spl
copy software/uboot_recover/{opos6ul_recovery.py => opos6ulnano_recovery.py} (85%)
diff --git a/software/uboot_recover/opos6ulnano-u-boot.img b/software/uboot_recover/opos6ulnano-u-boot.img
new file mode 100644
index 0000000..169f8de
Binary files /dev/null and b/software/uboot_recover/opos6ulnano-u-boot.img differ
diff --git a/software/uboot_recover/opos6ulnano-u-boot.spl b/software/uboot_recover/opos6ulnano-u-boot.spl
new file mode 100644
index 0000000..9e7b40d
Binary files /dev/null and b/software/uboot_recover/opos6ulnano-u-boot.spl differ
diff --git a/software/uboot_recover/opos6ul_recovery.py b/software/uboot_recover/opos6ulnano_recovery.py
similarity index 85%
copy from software/uboot_recover/opos6ul_recovery.py
copy to software/uboot_recover/opos6ulnano_recovery.py
index aa91e22..381af1f 100644
--- a/software/uboot_recover/opos6ul_recovery.py
+++ b/software/uboot_recover/opos6ulnano_recovery.py
@@ -1,7 +1,7 @@
#
-# OPOS6UL bootloader recovering tool
+# OPOS6ULNano bootloader recovering tool
#
-# Copyright (C) 2014 Armadeus Project
+# Copyright (C) 2018 Armadeus Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -84,18 +84,18 @@ if __name__ == "__main__":
BR_IMAGES_PATH = "../../buildroot/output/images"
USB_DOWNLOAD_APP = BR_HOST_PATH + "/usr/bin/imx_usb"
SERIAL_DOWNLOAD_APP = "sb"
- U_BOOT_SPL = "opos6ul-u-boot.spl"
- U_BOOT_IMG = "opos6ul-u-boot.img"
+ U_BOOT_SPL = "opos6ulnano-u-boot.spl"
+ U_BOOT_IMG = "opos6ulnano-u-boot.img"
SPEED = 115200
- print color.BOLD + "\n--- OPOS6UL Bootstrap Tool ---\n"
+ print color.BOLD + "\n--- OPOS6ULNano Bootstrap Tool ---\n"
print "Procedure to follow:"
print "1] Be sure to:"
- print " * have built the OPOS6UL BSP (make opos6ul_defconfig; make),"
+ print " * have built the OPOS6ULNano BSP (make opos6ulnano_defconfig; make),"
print " * have \"sb\" tool installed on your PC (on Ubuntu: sudo apt-get install lrzsz),"
print " * have launched this script as root (sudo)."
print "2] Power off your board, close all serial terminal sessions, remove all USB cables"
- print "3] Take jumper off BOOT1 pins (if any) and put a jumper on BOOT0 pins."
+ print "3] Sold a 3v3 on J5. See the OPOS6ULNano wiki page for more details"
print "4] Power on your board"
print "5] Connect a USB cable from your PC to the OPOS6ULDev OTG miniUSB connector"
print "6] Connect a USB cable from your PC to the OPOS6ULDev console/debug miniUSB connector"
@@ -105,7 +105,7 @@ if __name__ == "__main__":
port = '/dev/ttyUSB0'
if not os.path.exists(USB_DOWNLOAD_APP):
- print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make opos6ul_defconfig; make" + color.END
+ print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make opos6ulnano_defconfig; make" + color.END
sys.exit(1)
if not os.path.exists(U_BOOT_SPL) or not os.path.exists(U_BOOT_IMG):
@@ -161,4 +161,4 @@ if __name__ == "__main__":
sys.exit(1)
else:
print color.GREEN + "\n--- U-Boot successfully recovered !" + color.END
- print color.BOLD + "--- Now you can remove the miniUSB OTG cable and the jumper on BOOT0 pins. Your board will boot... As the restored U-Boot version may differ from the one your were using, " + color.UNDERLINE + "if you want to maximize the chances to keep your rootfs data safe, we strongly advise you to reflash the same U-Boot version your were using before the recovery. Otherwise (you don't care about your data), please upgrade to the latest available stable Armadeus U-Boot release." + color.END
+ print color.BOLD + "--- Now you can remove the miniUSB OTG cable and unsold the wire. Your board will boot... As the restored U-Boot version may differ from the one your were using, " + color.UNDERLINE + "if you want to maximize the chances to keep your rootfs data safe, we strongly advise you to reflash the same U-Boot version your were using before the recovery. Otherwise (you don't care about your data), please upgrade to the latest available stable Armadeus U-Boot release." + color.END
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@sf...> - 2018-03-16 16:55:12
|
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 26c3aaa34580d7acc064c205e2e125b43e764378 (commit)
from 5f528f74c476ed028ef15693c1ba998481f60b85 (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 26c3aaa34580d7acc064c205e2e125b43e764378
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 16 18:03:02 2018 +0100
[LINUX] opos6ulnano: dts: fix ethernet pin muxing (once again...)
-----------------------------------------------------------------------
Summary of changes:
...s-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch | 29 +++++++++-------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
index 5354dd4..b9dedb1 100644
--- a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
+++ b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
@@ -20,11 +20,11 @@ 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
-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) += \
+Index: linux-4.14.19/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-4.14.19.orig/arch/arm/boot/dts/Makefile
++++ linux-4.14.19/arch/arm/boot/dts/Makefile
+@@ -479,6 +479,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-isiot-nand.dtb \
imx6ul-liteboard.dtb \
imx6ul-opos6uldev.dtb \
@@ -32,11 +32,10 @@ index 9c5e1d9..dcbb2b0 100644
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
-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
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -176,7 +175,7 @@ index 0000000..cb89eba
+ 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_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
++ MX6UL_PAD_ENET2_RX_DATA1__ENET2_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
@@ -230,11 +229,10 @@ index 0000000..cb89eba
+ >;
+ };
+};
-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
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -487,6 +485,3 @@ index 0000000..1a542d1
+ >;
+ };
+};
---
-2.7.3
-
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-13 18:20:02
|
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 5f528f74c476ed028ef15693c1ba998481f60b85 (commit)
from 025e335f0f26cf7ca10fe75e69e55642c847f239 (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 5f528f74c476ed028ef15693c1ba998481f60b85
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Mar 13 19:19:26 2018 +0100
[BUILDROOT] Add python-gobject package to OPOS6UL* configs desserving it
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
buildroot/configs/opos6ultest_defconfig | 1 +
3 files changed, 3 insertions(+)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index b1eeeaa..ed85481 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -78,6 +78,7 @@ BR2_PACKAGE_PYTHON3_PYEXPAT=y
BR2_PACKAGE_PYTHON3_ZLIB=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 2cf9ebe..358fb8c 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -76,6 +76,7 @@ BR2_PACKAGE_PYTHON3_PYEXPAT=y
BR2_PACKAGE_PYTHON3_ZLIB=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index 85ab7d0..bc84e1e 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -88,6 +88,7 @@ BR2_PACKAGE_PYTHON3_PYEXPAT=y
BR2_PACKAGE_PYTHON3_ZLIB=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PYCLI=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@sf...> - 2018-03-13 09:09:17
|
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 025e335f0f26cf7ca10fe75e69e55642c847f239 (commit)
from b01939434cc04a2a4c7184aeee2817d633aec544 (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 025e335f0f26cf7ca10fe75e69e55642c847f239
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Mar 13 10:15:42 2018 +0100
[BUILDROOT] Prepare patches to BR 2018.02
The following patches have been removed:
032-armadeus-imx-lib-fixes-build-on-imx6ul.patch
033-armadeus-package-linux-tools-fixes-build-of-iio-with-4.14-ker.patch
039-armadeus-v4l2loopback-add-package.patch
042-mainline-add-rpi-bt-firmware-package.patch
221-imx-usb-loader-version-bump.patch
223-kodi-fix-build-when-BR2_PACKAGE_LIBFSLVPUWRAP-y.patch
227-package-mke2img-use-mkfs-to-generate-rootfs-image.patch
228-package-libpng-bump-version-to-1.6.29.patch
229-dbus-bump-version-to-1.10.22.patch
230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
...us-gpsd-add-options-setting-in-menuconfig.patch | 0
.../007-armadeus-add-agg-package.patch | 0
.../008-armadeus-add-gnash-package.patch | 0
.../009-armadeus-xc3sprog-new-package.patch | 0
.../010-armadeus-sam7-pgm-ng-new-package.patch | 0
.../011-armadeus-add-tk-package.patch | 0
...12-armadeus-add-tkinter-support-to-python.patch | 20 +++++++--------
.../014-armadeus-python-wx-add-package.patch | 0
.../016-armadeus-add-gnuboy-package.patch | 0
.../017-armadeus-add-rxtx-package.patch | 6 ++---
.../018-armadeus-add-pcidebug-package.patch | 0
.../019-armadeus-add-cmux-package.patch | 0
.../021-armadeus-add-sdl_water-package.patch | 0
.../022-armadeus-downgrade-can-utils-version.patch | 0
...eus-fixes-strace-4.9-build-on-old-kernels.patch | 0
...trace-cant-be-used-on-old-kernels-anymore.patch | 8 +++---
.../025-armadeus-apf-config-add-package.patch | 0
...deus-install-ldd-with-external-toolchains.patch | 0
...-busybox-fixes-rfkil-build-on-old-kernels.patch | 0
.../028-armadeus-fbgrab-bump-to-1.3-version.patch | 0
.../029-armadeus-lora-forwarder-add-package.patch | 0
.../030-armadeus-lmic-pi-add-package.patch | 0
.../031-armadeus-lepton-add-package.patch | 0
.../034-armadeus-add-slideshow-package.patch | 6 ++---
...e-openssh-also-install-ssh-copy-id-script.patch | 0
...armadeus-fb-test-fixes-tty-config-on-exit.patch | 0
.../040-armadeus-bump-stress-ng-version.patch | 0
...s-bump-modem-libraries-for-em7565-support.patch | 30 +++++++++++++---------
...add_support_for_custom_configuration_file.patch | 0
...072-armadeus-xenomai-download-adeos-patch.patch | 0
...ai-add-configure-options-for-old-versions.patch | 0
.../081-adds_quake_package.patch | 0
.../083-pygame-armadeus_addons.patch | 0
.../107-armadeus-games-add-wolf4sdl-package.patch | 0
.../118-armadeus-snes9x-add-package.patch | 0
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../123-armadeus-pywebradio-add-package.patch | 0
.../124-e-uae-add_package.patch | 0
...42-ncurses-fix_compilation_with_old_hosts.patch | 0
...-disable_ip_busybox_if_iproute2_buildroot.patch | 0
...fix_installation_bug_on_some_host_systems.patch | 0
.../172-gsmmux-add_package.patch | 0
.../176-imx-test-add_package.patch | 0
.../188-marble-add_package.patch | 0
.../197-cunit-add_package.patch | 4 +--
.../201-armadeus-add_gnokii.patch | 6 ++---
.../204-wpa-supplicant-add-option-ieee80211w.patch | 0
...x-coreutils-stty-add-rs485-config-options.patch | 0
.../208-armadeus-add_beremiz.patch | 0
.../209-armadeus-add_matiec.patch | 0
.../219-shiboken-add_package.patch | 0
.../221-imx-usb-loader-build-for-target.patch | 0
.../224-linux-headers-fix-uclibc-compilation.patch | 0
.../{2017.02 => 2018.02}/cleanup_buildroot.sh | 21 ---------------
56 files changed, 43 insertions(+), 58 deletions(-)
copy patches/buildroot/{2015.02 => 2018.02}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/007-armadeus-add-agg-package.patch (100%)
copy patches/buildroot/{2016.05 => 2018.02}/008-armadeus-add-gnash-package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/009-armadeus-xc3sprog-new-package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/010-armadeus-sam7-pgm-ng-new-package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/011-armadeus-add-tk-package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/012-armadeus-add-tkinter-support-to-python.patch (81%)
copy patches/buildroot/{2016.02 => 2018.02}/014-armadeus-python-wx-add-package.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/016-armadeus-add-gnuboy-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/017-armadeus-add-rxtx-package.patch (98%)
copy patches/buildroot/{2016.02 => 2018.02}/018-armadeus-add-pcidebug-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/019-armadeus-add-cmux-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/021-armadeus-add-sdl_water-package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/022-armadeus-downgrade-can-utils-version.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch (83%)
copy patches/buildroot/{2017.02 => 2018.02}/025-armadeus-apf-config-add-package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/026-armadeus-install-ldd-with-external-toolchains.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/028-armadeus-fbgrab-bump-to-1.3-version.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/029-armadeus-lora-forwarder-add-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/030-armadeus-lmic-pi-add-package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/031-armadeus-lepton-add-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/034-armadeus-add-slideshow-package.patch (97%)
copy patches/buildroot/{2017.02 => 2018.02}/035-armadeus-package-openssh-also-install-ssh-copy-id-script.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/038-armadeus-fb-test-fixes-tty-config-on-exit.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/040-armadeus-bump-stress-ng-version.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/041-armadeus-bump-modem-libraries-for-em7565-support.patch (69%)
copy patches/buildroot/{2017.02 => 2018.02}/050-U-Boot-add_support_for_custom_configuration_file.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/072-armadeus-xenomai-download-adeos-patch.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/073-armadeus-xenomai-add-configure-options-for-old-versions.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/081-adds_quake_package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/083-pygame-armadeus_addons.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/107-armadeus-games-add-wolf4sdl-package.patch (100%)
copy patches/buildroot/{2016.08 => 2018.02}/118-armadeus-snes9x-add-package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/121-target-arm926t_is_arm926ej-s.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/123-armadeus-pywebradio-add-package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/124-e-uae-add_package.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/142-ncurses-fix_compilation_with_old_hosts.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/172-gsmmux-add_package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/176-imx-test-add_package.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/188-marble-add_package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/197-cunit-add_package.patch (95%)
copy patches/buildroot/{2017.02 => 2018.02}/201-armadeus-add_gnokii.patch (91%)
copy patches/buildroot/{2015.02 => 2018.02}/204-wpa-supplicant-add-option-ieee80211w.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/205-busybox-coreutils-stty-add-rs485-config-options.patch (100%)
copy patches/buildroot/{2016.02 => 2018.02}/208-armadeus-add_beremiz.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/209-armadeus-add_matiec.patch (100%)
copy patches/buildroot/{2015.02 => 2018.02}/219-shiboken-add_package.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/221-imx-usb-loader-build-for-target.patch (100%)
copy patches/buildroot/{2016.05 => 2018.02}/224-linux-headers-fix-uclibc-compilation.patch (100%)
copy patches/buildroot/{2017.02 => 2018.02}/cleanup_buildroot.sh (86%)
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2018.02/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2015.02/001-add_armadeus_device.patch
copy to patches/buildroot/2018.02/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2018.02/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2018.02/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2016.08/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2018.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
similarity index 100%
copy from patches/buildroot/2016.08/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
copy to patches/buildroot/2018.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
diff --git a/patches/buildroot/2016.02/007-armadeus-add-agg-package.patch b/patches/buildroot/2018.02/007-armadeus-add-agg-package.patch
similarity index 100%
copy from patches/buildroot/2016.02/007-armadeus-add-agg-package.patch
copy to patches/buildroot/2018.02/007-armadeus-add-agg-package.patch
diff --git a/patches/buildroot/2016.05/008-armadeus-add-gnash-package.patch b/patches/buildroot/2018.02/008-armadeus-add-gnash-package.patch
similarity index 100%
copy from patches/buildroot/2016.05/008-armadeus-add-gnash-package.patch
copy to patches/buildroot/2018.02/008-armadeus-add-gnash-package.patch
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2018.02/009-armadeus-xc3sprog-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
copy to patches/buildroot/2018.02/009-armadeus-xc3sprog-new-package.patch
diff --git a/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2018.02/010-armadeus-sam7-pgm-ng-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
copy to patches/buildroot/2018.02/010-armadeus-sam7-pgm-ng-new-package.patch
diff --git a/patches/buildroot/2015.02/011-armadeus-add-tk-package.patch b/patches/buildroot/2018.02/011-armadeus-add-tk-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/011-armadeus-add-tk-package.patch
copy to patches/buildroot/2018.02/011-armadeus-add-tk-package.patch
diff --git a/patches/buildroot/2017.02/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch
similarity index 81%
copy from patches/buildroot/2017.02/012-armadeus-add-tkinter-support-to-python.patch
copy to patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch
index 481f0de..33f9e85 100644
--- a/patches/buildroot/2017.02/012-armadeus-add-tkinter-support-to-python.patch
+++ b/patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch
@@ -4,7 +4,7 @@ Index: buildroot/package/python/Config.in
===================================================================
--- buildroot.orig/package/python/Config.in
+++ buildroot/package/python/Config.in
-@@ -79,6 +79,18 @@ config BR2_PACKAGE_PYTHON_SSL
+@@ -80,6 +80,18 @@ config BR2_PACKAGE_PYTHON_SSL
help
_ssl module for Python (required for https in urllib etc).
@@ -27,7 +27,7 @@ Index: buildroot/package/python/python.mk
===================================================================
--- buildroot.orig/package/python/python.mk
+++ buildroot/package/python/python.mk
-@@ -133,6 +133,12 @@ else
+@@ -137,6 +137,12 @@ else
PYTHON_CONF_OPTS += --disable-ossaudiodev
endif
@@ -40,11 +40,11 @@ Index: buildroot/package/python/python.mk
# Make python believe we don't have 'hg' and 'svn', so that it doesn't
# try to communicate over the network during the build.
PYTHON_CONF_ENV += \
-@@ -158,7 +164,6 @@ PYTHON_CONF_OPTS += \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
-- --disable-tk \
- --disable-nis \
- --disable-dbm \
- --disable-pyo-build \
+@@ -162,7 +168,6 @@ PYTHON_CONF_OPTS += \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
+- --disable-tk \
+ --disable-nis \
+ --disable-dbm \
+ --disable-pyo-build \
diff --git a/patches/buildroot/2016.02/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2018.02/014-armadeus-python-wx-add-package.patch
similarity index 100%
copy from patches/buildroot/2016.02/014-armadeus-python-wx-add-package.patch
copy to patches/buildroot/2018.02/014-armadeus-python-wx-add-package.patch
diff --git a/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2018.02/016-armadeus-add-gnuboy-package.patch
similarity index 100%
copy from patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
copy to patches/buildroot/2018.02/016-armadeus-add-gnuboy-package.patch
diff --git a/patches/buildroot/2016.08/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2018.02/017-armadeus-add-rxtx-package.patch
similarity index 98%
copy from patches/buildroot/2016.08/017-armadeus-add-rxtx-package.patch
copy to patches/buildroot/2018.02/017-armadeus-add-rxtx-package.patch
index a7c78f4..5cf4fba 100644
--- a/patches/buildroot/2016.08/017-armadeus-add-rxtx-package.patch
+++ b/patches/buildroot/2018.02/017-armadeus-add-rxtx-package.patch
@@ -2,10 +2,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -434,6 +434,7 @@ endif
- source "package/rpi-userland/Config.in"
- source "package/rtl8188eu/Config.in"
+@@ -495,6 +495,7 @@ endmenu
+ source "package/rtl8723bu/Config.in"
source "package/rtl8821au/Config.in"
+ source "package/rtl8189fs/Config.in"
+ source "package/rxtx/Config.in"
source "package/sane-backends/Config.in"
source "package/sam7-pgm-ng/Config.in"
diff --git a/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2018.02/018-armadeus-add-pcidebug-package.patch
similarity index 100%
copy from patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
copy to patches/buildroot/2018.02/018-armadeus-add-pcidebug-package.patch
diff --git a/patches/buildroot/2016.08/019-armadeus-add-cmux-package.patch b/patches/buildroot/2018.02/019-armadeus-add-cmux-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/019-armadeus-add-cmux-package.patch
copy to patches/buildroot/2018.02/019-armadeus-add-cmux-package.patch
diff --git a/patches/buildroot/2016.08/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2018.02/021-armadeus-add-sdl_water-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/021-armadeus-add-sdl_water-package.patch
copy to patches/buildroot/2018.02/021-armadeus-add-sdl_water-package.patch
diff --git a/patches/buildroot/2017.02/022-armadeus-downgrade-can-utils-version.patch b/patches/buildroot/2018.02/022-armadeus-downgrade-can-utils-version.patch
similarity index 100%
copy from patches/buildroot/2017.02/022-armadeus-downgrade-can-utils-version.patch
copy to patches/buildroot/2018.02/022-armadeus-downgrade-can-utils-version.patch
diff --git a/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch b/patches/buildroot/2018.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
similarity index 100%
copy from patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
copy to patches/buildroot/2018.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
diff --git a/patches/buildroot/2017.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch b/patches/buildroot/2018.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch
similarity index 83%
copy from patches/buildroot/2017.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch
copy to patches/buildroot/2018.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch
index c49517d..8550c9d 100644
--- a/patches/buildroot/2017.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch
+++ b/patches/buildroot/2018.02/024-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch
@@ -7,14 +7,14 @@ Index: buildroot/package/ltrace/Config.in
===================================================================
--- buildroot.orig/package/ltrace/Config.in
+++ buildroot/package/ltrace/Config.in
-@@ -10,6 +10,7 @@ config BR2_PACKAGE_LTRACE
+@@ -3,6 +3,7 @@ config BR2_PACKAGE_LTRACE
depends on BR2_USE_WCHAR # elfutils
depends on !BR2_STATIC_LIBS # elfutils
depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # PTRACE_GETVFPREGS syscall
- help
- Debugging program which runs a specified command until it exits.
- While the command is executing, ltrace intercepts and records
+ # ltrace normally has mips/mipsel support, but it's currently
+ # broken (error: 'struct ltelf' has no member named
+ # 'relplt_count'). Issue reported upstream at
@@ -18,6 +19,6 @@ config BR2_PACKAGE_LTRACE
http://ltrace.org
diff --git a/patches/buildroot/2017.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2018.02/025-armadeus-apf-config-add-package.patch
similarity index 100%
copy from patches/buildroot/2017.02/025-armadeus-apf-config-add-package.patch
copy to patches/buildroot/2018.02/025-armadeus-apf-config-add-package.patch
diff --git a/patches/buildroot/2017.02/026-armadeus-install-ldd-with-external-toolchains.patch b/patches/buildroot/2018.02/026-armadeus-install-ldd-with-external-toolchains.patch
similarity index 100%
copy from patches/buildroot/2017.02/026-armadeus-install-ldd-with-external-toolchains.patch
copy to patches/buildroot/2018.02/026-armadeus-install-ldd-with-external-toolchains.patch
diff --git a/patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch b/patches/buildroot/2018.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch
similarity index 100%
copy from patches/buildroot/2015.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch
copy to patches/buildroot/2018.02/027-armadeus-busybox-fixes-rfkil-build-on-old-kernels.patch
diff --git a/patches/buildroot/2016.02/028-armadeus-fbgrab-bump-to-1.3-version.patch b/patches/buildroot/2018.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
similarity index 100%
copy from patches/buildroot/2016.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
copy to patches/buildroot/2018.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
diff --git a/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2018.02/029-armadeus-lora-forwarder-add-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
copy to patches/buildroot/2018.02/029-armadeus-lora-forwarder-add-package.patch
diff --git a/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch b/patches/buildroot/2018.02/030-armadeus-lmic-pi-add-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
copy to patches/buildroot/2018.02/030-armadeus-lmic-pi-add-package.patch
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch b/patches/buildroot/2018.02/031-armadeus-lepton-add-package.patch
similarity index 100%
copy from patches/buildroot/2017.02/031-armadeus-lepton-add-package.patch
copy to patches/buildroot/2018.02/031-armadeus-lepton-add-package.patch
diff --git a/patches/buildroot/2016.08/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch
similarity index 97%
copy from patches/buildroot/2016.08/034-armadeus-add-slideshow-package.patch
copy to patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch
index 4355881..a55d078 100644
--- a/patches/buildroot/2016.08/034-armadeus-add-slideshow-package.patch
+++ b/patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -246,6 +246,7 @@ comment "Graphic applications"
- source "package/mesa3d-demos/Config.in"
+@@ -269,6 +269,7 @@ comment "Graphic applications"
+ source "package/pngquant/Config.in"
source "package/qt5cinex/Config.in"
source "package/rrdtool/Config.in"
+ source "package/slideshow/Config.in"
+ source "package/tesseract-ocr/Config.in"
comment "Graphic libraries"
- source "package/cegui06/Config.in"
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2017.02/035-armadeus-package-openssh-also-install-ssh-copy-id-script.patch b/patches/buildroot/2018.02/035-armadeus-package-openssh-also-install-ssh-copy-id-script.patch
similarity index 100%
copy from patches/buildroot/2017.02/035-armadeus-package-openssh-also-install-ssh-copy-id-script.patch
copy to patches/buildroot/2018.02/035-armadeus-package-openssh-also-install-ssh-copy-id-script.patch
diff --git a/patches/buildroot/2015.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch b/patches/buildroot/2018.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
similarity index 100%
copy from patches/buildroot/2015.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
copy to patches/buildroot/2018.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
diff --git a/patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch b/patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch
similarity index 100%
copy from patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch
copy to patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch
diff --git a/patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch b/patches/buildroot/2018.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
similarity index 69%
copy from patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
copy to patches/buildroot/2018.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
index 388dc46..e10eea5 100644
--- a/patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
+++ b/patches/buildroot/2018.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
@@ -6,10 +6,12 @@ Index: buildroot/package/libmbim/libmbim.hash
===================================================================
--- buildroot.orig/package/libmbim/libmbim.hash
+++ buildroot/package/libmbim/libmbim.hash
-@@ -1,2 +1,3 @@
+@@ -1,4 +1,5 @@
# Locally computed:
- sha256 ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b libmbim-1.14.0.tar.xz
+ sha256 22cafe6b8432433aa58bedcf7db71111522ce6531bfe24e8e9b6058412cd31cf libmbim-1.14.2.tar.xz
+sha256 c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2 libmbim-1.16.0.tar.xz
+ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+ sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
Index: buildroot/package/libmbim/libmbim.mk
===================================================================
--- buildroot.orig/package/libmbim/libmbim.mk
@@ -18,19 +20,21 @@ Index: buildroot/package/libmbim/libmbim.mk
#
################################################################################
--LIBMBIM_VERSION = 1.14.0
+-LIBMBIM_VERSION = 1.14.2
+LIBMBIM_VERSION = 1.16.0
LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
- LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+ LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
Index: buildroot/package/modem-manager/modem-manager.hash
===================================================================
--- buildroot.orig/package/modem-manager/modem-manager.hash
+++ buildroot/package/modem-manager/modem-manager.hash
-@@ -1,2 +1,3 @@
+@@ -1,4 +1,5 @@
# Locally computed
- sha256 e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393 ModemManager-1.6.2.tar.xz
+ sha256 bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68 ModemManager-1.6.10.tar.xz
+sha256 d465094fc6fc173354f5a00d212049056829cc245d60a9083f3c53f86a8f90ec ModemManager-1.7.990.tar.xz
+ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+ sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
Index: buildroot/package/modem-manager/modem-manager.mk
===================================================================
--- buildroot.orig/package/modem-manager/modem-manager.mk
@@ -39,20 +43,22 @@ Index: buildroot/package/modem-manager/modem-manager.mk
#
################################################################################
--MODEM_MANAGER_VERSION = 1.6.2
+-MODEM_MANAGER_VERSION = 1.6.10
+MODEM_MANAGER_VERSION = 1.7.990
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
- MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
+ MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
Index: buildroot/package/libqmi/libqmi.hash
===================================================================
--- buildroot.orig/package/libqmi/libqmi.hash
+++ buildroot/package/libqmi/libqmi.hash
-@@ -1,2 +1,4 @@
+@@ -1,4 +1,6 @@
# Locally computed:
- sha256 7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a libqmi-1.16.0.tar.xz
+ sha256 a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec libqmi-1.18.0.tar.xz
+sha256 1e3c5f2968514dc7e333867883889fd0bf17e81ee1e588f17341018ff112cb9f libqmi-1.18.2.tar.xz
+sha256 21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4 libqmi-1.20.0.tar.xz
+ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+ sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
Index: buildroot/package/libqmi/libqmi.mk
===================================================================
--- buildroot.orig/package/libqmi/libqmi.mk
@@ -61,8 +67,8 @@ Index: buildroot/package/libqmi/libqmi.mk
#
################################################################################
--LIBQMI_VERSION = 1.16.0
+-LIBQMI_VERSION = 1.18.0
+LIBQMI_VERSION = 1.20.0
LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
- LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+ LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
diff --git a/patches/buildroot/2017.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2018.02/050-U-Boot-add_support_for_custom_configuration_file.patch
similarity index 100%
copy from patches/buildroot/2017.02/050-U-Boot-add_support_for_custom_configuration_file.patch
copy to patches/buildroot/2018.02/050-U-Boot-add_support_for_custom_configuration_file.patch
diff --git a/patches/buildroot/2017.02/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2018.02/072-armadeus-xenomai-download-adeos-patch.patch
similarity index 100%
copy from patches/buildroot/2017.02/072-armadeus-xenomai-download-adeos-patch.patch
copy to patches/buildroot/2018.02/072-armadeus-xenomai-download-adeos-patch.patch
diff --git a/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch b/patches/buildroot/2018.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
similarity index 100%
copy from patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
copy to patches/buildroot/2018.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
diff --git a/patches/buildroot/2016.02/081-adds_quake_package.patch b/patches/buildroot/2018.02/081-adds_quake_package.patch
similarity index 100%
copy from patches/buildroot/2016.02/081-adds_quake_package.patch
copy to patches/buildroot/2018.02/081-adds_quake_package.patch
diff --git a/patches/buildroot/2015.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2018.02/083-pygame-armadeus_addons.patch
similarity index 100%
copy from patches/buildroot/2015.02/083-pygame-armadeus_addons.patch
copy to patches/buildroot/2018.02/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2016.08/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2018.02/107-armadeus-games-add-wolf4sdl-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/107-armadeus-games-add-wolf4sdl-package.patch
copy to patches/buildroot/2018.02/107-armadeus-games-add-wolf4sdl-package.patch
diff --git a/patches/buildroot/2016.08/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2018.02/118-armadeus-snes9x-add-package.patch
similarity index 100%
copy from patches/buildroot/2016.08/118-armadeus-snes9x-add-package.patch
copy to patches/buildroot/2018.02/118-armadeus-snes9x-add-package.patch
diff --git a/patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2018.02/121-target-arm926t_is_arm926ej-s.patch
similarity index 100%
copy from patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch
copy to patches/buildroot/2018.02/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2018.02/123-armadeus-pywebradio-add-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch
copy to patches/buildroot/2018.02/123-armadeus-pywebradio-add-package.patch
diff --git a/patches/buildroot/2015.02/124-e-uae-add_package.patch b/patches/buildroot/2018.02/124-e-uae-add_package.patch
similarity index 100%
copy from patches/buildroot/2015.02/124-e-uae-add_package.patch
copy to patches/buildroot/2018.02/124-e-uae-add_package.patch
diff --git a/patches/buildroot/2015.02/142-ncurses-fix_compilation_with_old_hosts.patch b/patches/buildroot/2018.02/142-ncurses-fix_compilation_with_old_hosts.patch
similarity index 100%
copy from patches/buildroot/2015.02/142-ncurses-fix_compilation_with_old_hosts.patch
copy to patches/buildroot/2018.02/142-ncurses-fix_compilation_with_old_hosts.patch
diff --git a/patches/buildroot/2016.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2018.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
similarity index 100%
copy from patches/buildroot/2016.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
copy to patches/buildroot/2018.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
diff --git a/patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2018.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
similarity index 100%
copy from patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
copy to patches/buildroot/2018.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/patches/buildroot/2015.02/172-gsmmux-add_package.patch b/patches/buildroot/2018.02/172-gsmmux-add_package.patch
similarity index 100%
copy from patches/buildroot/2015.02/172-gsmmux-add_package.patch
copy to patches/buildroot/2018.02/172-gsmmux-add_package.patch
diff --git a/patches/buildroot/2017.02/176-imx-test-add_package.patch b/patches/buildroot/2018.02/176-imx-test-add_package.patch
similarity index 100%
copy from patches/buildroot/2017.02/176-imx-test-add_package.patch
copy to patches/buildroot/2018.02/176-imx-test-add_package.patch
diff --git a/patches/buildroot/2016.02/188-marble-add_package.patch b/patches/buildroot/2018.02/188-marble-add_package.patch
similarity index 100%
copy from patches/buildroot/2016.02/188-marble-add_package.patch
copy to patches/buildroot/2018.02/188-marble-add_package.patch
diff --git a/patches/buildroot/2017.02/197-cunit-add_package.patch b/patches/buildroot/2018.02/197-cunit-add_package.patch
similarity index 95%
copy from patches/buildroot/2017.02/197-cunit-add_package.patch
copy to patches/buildroot/2018.02/197-cunit-add_package.patch
index b3b1a18..399dd28 100644
--- a/patches/buildroot/2017.02/197-cunit-add_package.patch
+++ b/patches/buildroot/2018.02/197-cunit-add_package.patch
@@ -39,10 +39,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -1179,6 +1179,7 @@ menu "Other"
- source "package/clapack/Config.in"
+@@ -1486,6 +1486,7 @@ menu "Other"
source "package/classpath/Config.in"
source "package/cppcms/Config.in"
+ source "package/cracklib/Config.in"
+ source "package/cunit/Config.in"
source "package/dawgdic/Config.in"
source "package/ding-libs/Config.in"
diff --git a/patches/buildroot/2017.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2018.02/201-armadeus-add_gnokii.patch
similarity index 91%
copy from patches/buildroot/2017.02/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2018.02/201-armadeus-add_gnokii.patch
index a248dd8..6161c22 100644
--- a/patches/buildroot/2017.02/201-armadeus-add_gnokii.patch
+++ b/patches/buildroot/2018.02/201-armadeus-add_gnokii.patch
@@ -7,10 +7,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -1546,6 +1546,7 @@ menu "Networking applications"
- source "package/fping/Config.in"
- source "package/freeswitch/Config.in"
+@@ -1709,6 +1709,7 @@ menu "Networking applications"
+ source "package/freeswitch-mod-bcg729/Config.in"
source "package/gesftpserver/Config.in"
+ source "package/glorytun/Config.in"
+ source "package/gnokii/Config.in"
source "package/gupnp-tools/Config.in"
source "package/gutenprint/Config.in"
diff --git a/patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch b/patches/buildroot/2018.02/204-wpa-supplicant-add-option-ieee80211w.patch
similarity index 100%
copy from patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch
copy to patches/buildroot/2018.02/204-wpa-supplicant-add-option-ieee80211w.patch
diff --git a/patches/buildroot/2017.02/205-busybox-coreutils-stty-add-rs485-config-options.patch b/patches/buildroot/2018.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
similarity index 100%
copy from patches/buildroot/2017.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
copy to patches/buildroot/2018.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
diff --git a/patches/buildroot/2016.02/208-armadeus-add_beremiz.patch b/patches/buildroot/2018.02/208-armadeus-add_beremiz.patch
similarity index 100%
copy from patches/buildroot/2016.02/208-armadeus-add_beremiz.patch
copy to patches/buildroot/2018.02/208-armadeus-add_beremiz.patch
diff --git a/patches/buildroot/2015.02/209-armadeus-add_matiec.patch b/patches/buildroot/2018.02/209-armadeus-add_matiec.patch
similarity index 100%
copy from patches/buildroot/2015.02/209-armadeus-add_matiec.patch
copy to patches/buildroot/2018.02/209-armadeus-add_matiec.patch
diff --git a/patches/buildroot/2015.02/219-shiboken-add_package.patch b/patches/buildroot/2018.02/219-shiboken-add_package.patch
similarity index 100%
copy from patches/buildroot/2015.02/219-shiboken-add_package.patch
copy to patches/buildroot/2018.02/219-shiboken-add_package.patch
diff --git a/patches/buildroot/2017.02/221-imx-usb-loader-build-for-target.patch b/patches/buildroot/2018.02/221-imx-usb-loader-build-for-target.patch
similarity index 100%
copy from patches/buildroot/2017.02/221-imx-usb-loader-build-for-target.patch
copy to patches/buildroot/2018.02/221-imx-usb-loader-build-for-target.patch
diff --git a/patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch b/patches/buildroot/2018.02/224-linux-headers-fix-uclibc-compilation.patch
similarity index 100%
copy from patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch
copy to patches/buildroot/2018.02/224-linux-headers-fix-uclibc-compilation.patch
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2018.02/cleanup_buildroot.sh
similarity index 86%
copy from patches/buildroot/2017.02/cleanup_buildroot.sh
copy to patches/buildroot/2018.02/cleanup_buildroot.sh
index 7c7363c..9dfb1a1 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2018.02/cleanup_buildroot.sh
@@ -34,15 +34,10 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
-rm -rf buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-rm -rf buildroot/package/dbus/dbus.hash
-rm -rf buildroot/package/dbus/dbus.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/fbgrab/0002-fix-1.3-version.patch
-rm -rf buildroot/package/freescale-imx/Config.in
-rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
@@ -61,23 +56,16 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/imx-usb-loader/Config.in
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.hash
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
-rm -rf buildroot/package/kodi/Config.in
-rm -rf buildroot/package/kodi/kodi.mk
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
rm -rf buildroot/package/libmbim/libmbim.hash
rm -rf buildroot/package/libmbim/libmbim.mk
-rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
-rm -rf buildroot/package/libpng/libpng.hash
-rm -rf buildroot/package/libpng/libpng.mk
rm -rf buildroot/package/libqmi/libqmi.hash
rm -rf buildroot/package/libqmi/libqmi.mk
rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
-rm -rf buildroot/package/linux-tools/linux-tool-iio.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
@@ -90,9 +78,6 @@ rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
rm -rf buildroot/package/matiec/matiec.mk
-rm -rf buildroot/package/mke2img/Config.in.host
-rm -rf buildroot/package/mke2img/mke2img
-rm -rf buildroot/package/mke2img/mke2img.mk
rm -rf buildroot/package/modem-manager/modem-manager.hash
rm -rf buildroot/package/modem-manager/modem-manager.mk
rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
@@ -109,9 +94,6 @@ rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
-rm -rf buildroot/package/rpi-bt-firmware/Config.in
-rm -rf buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
-rm -rf buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
rm -rf buildroot/package/rxtx/Config.in
rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
@@ -141,9 +123,6 @@ rm -rf buildroot/package/stress-ng/stress-ng.hash
rm -rf buildroot/package/stress-ng/stress-ng.mk
rm -rf buildroot/package/tk/Config.in
rm -rf buildroot/package/tk/tk.mk
-rm -rf buildroot/package/v4l2loopback/001-v4l2loopback-examples-cross-compiling-fixes.patch
-rm -rf buildroot/package/v4l2loopback/Config.in
-rm -rf buildroot/package/v4l2loopback/v4l2loopback.mk
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-07 16:01:40
|
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 b01939434cc04a2a4c7184aeee2817d633aec544 (commit)
from f2382f18282e32cc91eb6c675cbf1cde8c76f7b2 (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 b01939434cc04a2a4c7184aeee2817d633aec544
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Mar 7 16:59:44 2018 +0100
[BUILDROOT] 2017.02 Add rpi-bt-firmware package (mainline backport) and activate it by default on NANO configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ulnano-preempt-rt_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
.../042-mainline-add-rpi-bt-firmware-package.patch | 62 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 11 ++--
4 files changed, 71 insertions(+), 4 deletions(-)
create mode 100644 patches/buildroot/2017.02/042-mainline-add-rpi-bt-firmware-package.patch
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index d2802b2..009b553 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -58,6 +58,7 @@ BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_RPI_BT_FIRMWARE=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 1d63486..2cf9ebe 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -58,6 +58,7 @@ BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_GIF is not set
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+BR2_PACKAGE_RPI_BT_FIRMWARE=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
diff --git a/patches/buildroot/2017.02/042-mainline-add-rpi-bt-firmware-package.patch b/patches/buildroot/2017.02/042-mainline-add-rpi-bt-firmware-package.patch
new file mode 100644
index 0000000..a65da42
--- /dev/null
+++ b/patches/buildroot/2017.02/042-mainline-add-rpi-bt-firmware-package.patch
@@ -0,0 +1,62 @@
+Backport from BR mainline...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/rpi-bt-firmware/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/rpi-bt-firmware/Config.in
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_RPI_BT_FIRMWARE
++ bool "rpi-bt-firmware"
++ depends on BR2_arm || BR2_aarch64
++ help
++ Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module
++ firmware. Also works for Armadeus OPOS6UL(NANO) modules.
++
++ https://aur.archlinux.org/packages/pi-bluetooth
+Index: buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
+===================================================================
+--- /dev/null
++++ buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
+@@ -0,0 +1,2 @@
++# Locally computed
++sha256 5d9c9364277414ffd67b4a266cdf88e92f28eb937e5a413750e87b7a94161bef rpi-bt-firmware-a439f892bf549ddfefa9ba7ad1999cc515f233bf.tar.gz
+Index: buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
+@@ -0,0 +1,21 @@
++################################################################################
++#
++# rpi-bt-firmware
++#
++################################################################################
++
++RPI_BT_FIRMWARE_VERSION = a439f892bf549ddfefa9ba7ad1999cc515f233bf
++RPI_BT_FIRMWARE_SITE = https://aur.archlinux.org/pi-bluetooth.git
++RPI_BT_FIRMWARE_SITE_METHOD = git
++RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
++RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
++
++# The BlueZ hciattach utility looks for firmware in /etc/firmware. Add a
++# compatibility symlink.
++define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS
++ ln -sf ../lib/firmware $(TARGET_DIR)/etc/firmware
++ $(INSTALL) -D -m 0644 $(@D)/BCM43430A1.hcd \
++ $(TARGET_DIR)/lib/firmware/BCM43430A1.hcd
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -356,6 +356,7 @@ menu "Firmware"
+ source "package/am33x-cm3/Config.in"
+ source "package/b43-firmware/Config.in"
+ source "package/linux-firmware/Config.in"
++ source "package/rpi-bt-firmware/Config.in"
+ source "package/rpi-firmware/Config.in"
+ source "package/sunxi-boards/Config.in"
+ source "package/ts4900-fpga/Config.in"
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 432e672..7c7363c 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -67,17 +67,17 @@ rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
-rm -rf buildroot/package/libmbim/libmbim.mk
rm -rf buildroot/package/libmbim/libmbim.hash
+rm -rf buildroot/package/libmbim/libmbim.mk
rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
-rm -rf buildroot/package/libqmi/libqmi.mk
rm -rf buildroot/package/libqmi/libqmi.hash
+rm -rf buildroot/package/libqmi/libqmi.mk
rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
-rm -rf buildroot/package/linux-tools/linux-tool-iio.mk.in
+rm -rf buildroot/package/linux-tools/linux-tool-iio.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
@@ -93,8 +93,8 @@ rm -rf buildroot/package/matiec/matiec.mk
rm -rf buildroot/package/mke2img/Config.in.host
rm -rf buildroot/package/mke2img/mke2img
rm -rf buildroot/package/mke2img/mke2img.mk
-rm -rf buildroot/package/modem-manager/modem-manager.mk
rm -rf buildroot/package/modem-manager/modem-manager.hash
+rm -rf buildroot/package/modem-manager/modem-manager.mk
rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
rm -rf buildroot/package/openssh/openssh.mk
rm -rf buildroot/package/pci_debug/Config.in
@@ -109,6 +109,9 @@ rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rpi-bt-firmware/Config.in
+rm -rf buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
+rm -rf buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
rm -rf buildroot/package/rxtx/Config.in
rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-06 15:12:54
|
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 f2382f18282e32cc91eb6c675cbf1cde8c76f7b2 (commit)
from 6a43e12493c0074f4575ffcd31f64be4c5365658 (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 f2382f18282e32cc91eb6c675cbf1cde8c76f7b2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Mar 6 16:12:37 2018 +0100
[ROOTFS] Fixes post_build.sh to generate correct /etc/machine for OPOS6ULNANO
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/rootfs/post_build.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 6f07f97..44a33b0 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -29,12 +29,16 @@ else
fi
fi
-# Not using $2 because it can be changed for customers' BSP
+# !! Beware if using $2, because it can be changed for customers' BSP !!
if [ "$3" != "imxl" ]; then
if [ "$3" != "imx6ul" ]; then
echo "APF"${3//[!0-9]/} > $1/etc/machine
else
- echo "OPOS6UL" > $1/etc/machine
+ if [ "$2" == "opos6ulnano" ]; then
+ echo "OPOS6ULNANO" > $1/etc/machine
+ else
+ echo "OPOS6UL" > $1/etc/machine
+ fi
fi
else
echo "APF9328" > $1/etc/machine
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-06 15:08:37
|
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 6a43e12493c0074f4575ffcd31f64be4c5365658 (commit)
from bedfd801e2a5a25a68a44abe10e424dc19687e43 (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 6a43e12493c0074f4575ffcd31f64be4c5365658
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Mar 6 16:07:16 2018 +0100
[ROOTFS] Fixes /etc/init.d/S11firstboot for usage on OPOS6ULNANO. Add it /etc/fw_env.config installation while we are at it...
-----------------------------------------------------------------------
Summary of changes:
...w_env_opos6ul.config => fw_env_opos6ulnano.config} | 2 +-
.../rootfs/target_overlay/etc/init.d/S11firstboot | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
copy buildroot/target/device/armadeus/rootfs/target_overlay/etc/{fw_env_opos6ul.config => fw_env_opos6ulnano.config} (94%)
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
similarity index 94%
copy from buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
index e5a3cf9..307ea0f 100644
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
@@ -1,4 +1,4 @@
-# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS6UL <<<.
+# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS6ULNANO <<<.
# Up to two entries are valid, in this case the redundant environment sector is
# assumed present.
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
index 668b28b..88cbd65 100755
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# needs to be run after mdev as it uses /dev/root
FIRST_BOOT=/boot/.first_boot
@@ -10,7 +9,7 @@ start()
echo "Executing First Boot script"
# Resize rootfs (if on eMMC)
- ROOTFS=`readlink /dev/root`
+ ROOTFS=`lsblk | grep /$ | cut -d - -f 2 | cut -d " " -f 1`
case "$ROOTFS" in
mmcblk*)
echo -n "Resizing eMMC ROOTFS partition (/dev/$ROOTFS): "
@@ -25,9 +24,19 @@ start()
esac
# Update framebuffer modes config file, if needed (required by SDL)
- FILE=/etc/fb.modes
- if [ ! -f "$FILE" ]; then
- fbset > $FILE
+ if [ -c /dev/fb0 ]; then
+ FILE=/etc/fb.modes
+ if [ ! -f "$FILE" ]; then
+ fbset > $FILE
+ fi
+ fi
+
+ # Set correct config file for fw_printenv/setenv commands
+ MACHINE=`cat /etc/machine`
+ machine=`echo "$MACHINE" | tr '[:upper:]' '[:lower:]'`
+ if [ -f "/etc/fw_env_${machine}.config" ]; then
+ echo "Installing /etc/fw_env_${machine}.config as /etc/fw_env.config"
+ cp /etc/fw_env_${machine}.config /etc/fw_env.config
fi
rm $FIRST_BOOT
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-06 11:15:06
|
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 bedfd801e2a5a25a68a44abe10e424dc19687e43 (commit)
from 249386322e3292817c37d1707cc02402206e4d91 (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 bedfd801e2a5a25a68a44abe10e424dc19687e43
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Mar 6 12:14:24 2018 +0100
[BUILDROOT] opos6ul(nano): add tcpdump to all configs deserving it
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ul_legacy_defconfig | 1 +
buildroot/configs/opos6ullegacy-4.1_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
4 files changed, 4 insertions(+)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 88aa03f..b1eeeaa 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index afc1b59..e17cd3c 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -90,6 +90,7 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index a4b3b8b..fa1c1dd 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -143,6 +143,7 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 40f7b25..1d63486 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -111,6 +111,7 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-05 16:02:00
|
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 249386322e3292817c37d1707cc02402206e4d91 (commit)
from b4b5b92128593ca2b766575e3a9a1ef87e348ce7 (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 249386322e3292817c37d1707cc02402206e4d91
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Mar 5 17:01:37 2018 +0100
[LINUX] NANO: 4.9/4.14: add OOB SDIO interrupt support for Wi-Fi module
-----------------------------------------------------------------------
Summary of changes:
...M-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch | 6 ++----
.../0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
index e0945cf..5354dd4 100644
--- a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
+++ b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
@@ -37,7 +37,7 @@ new file mode 100644
index 0000000..cb89eba
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,192 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
+ *
@@ -163,11 +163,9 @@ index 0000000..cb89eba
+ brcmf: brcmf@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
-+ /*
+ interrupt-parent = <&gpio4>;
+ interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
-+ */
+ };
+};
+
@@ -228,7 +226,7 @@ index 0000000..cb89eba
+ /* WL_REG_ON */
+ MX6UL_PAD_NAND_DATA06__GPIO4_IO08 0x130b0
+ /* WL_IRQ */
-+ MX6UL_PAD_NAND_DATA02__GPIO4_IO04 0x130b0
++ MX6UL_PAD_NAND_DATA02__GPIO4_IO04 0x1b0b0 /* 100k pullup */
+ >;
+ };
+};
diff --git a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch b/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
index 8234b61..3577be5 100644
--- a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
+++ b/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
@@ -36,7 +36,7 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
===================================================================
--- /dev/null
+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,192 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
+ *
@@ -162,11 +162,9 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ brcmf: brcmf@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
-+ /*
+ interrupt-parent = <&gpio4>;
+ interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "host-wake";
-+ */
+ };
+};
+
@@ -227,7 +225,7 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ /* WL_REG_ON */
+ MX6UL_PAD_NAND_DATA06__GPIO4_IO08 0x130b0
+ /* WL_IRQ */
-+ MX6UL_PAD_NAND_DATA02__GPIO4_IO04 0x130b0
++ MX6UL_PAD_NAND_DATA02__GPIO4_IO04 0x1b0b0 /* 100k pullup */
+ >;
+ };
+};
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-03-05 15:43:51
|
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 b4b5b92128593ca2b766575e3a9a1ef87e348ce7 (commit)
from b7bca5e486ae5a9dab8b59d69f7a36ebcff86411 (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 b4b5b92128593ca2b766575e3a9a1ef87e348ce7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Mar 2 18:30:51 2018 +0100
[TOOLS] Fixes scripts/quiltify.sh when no filtered patches are found
-----------------------------------------------------------------------
Summary of changes:
scripts/quiltify.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 7a57ec3..846c763 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -191,11 +191,16 @@ fi
mkdir patches
if [ "$QUILT_PATCH_FILTER" != "" ]; then
PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch | grep $QUILT_PATCH_FILTER`
+ if [ "$PATCHES" == "" ]; then
+ # No filtered patches, try normal ones
+ PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
+ fi
else
PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
fi
for patch in $PATCHES; do
+ echo ">>> Importing patch $patch"
quilt import $patch
done
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-02-27 23:09:57
|
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 88fa93ac39de51e719a4ba41d4df0109f54ea20b (commit)
from 0e416a283ef7e91547d369c4bc495a918e9aa704 (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 88fa93ac39de51e719a4ba41d4df0109f54ea20b
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Feb 20 18:32:28 2018 +0100
[BUILDROOT] Bump modemmanager & libqmi & libmbim versions
-----------------------------------------------------------------------
Summary of changes:
...s-bump-modem-libraries-for-em7565-support.patch | 68 ++++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 6 ++
2 files changed, 74 insertions(+)
create mode 100644 patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
diff --git a/patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch b/patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
new file mode 100644
index 0000000..388dc46
--- /dev/null
+++ b/patches/buildroot/2017.02/041-armadeus-bump-modem-libraries-for-em7565-support.patch
@@ -0,0 +1,68 @@
+Sierra EM7565 4G MODEM is only supported by recent modemmanager releases.
+
+Signed-off-by: Julien BOIBESSOT <jul...@ar...>
+
+Index: buildroot/package/libmbim/libmbim.hash
+===================================================================
+--- buildroot.orig/package/libmbim/libmbim.hash
++++ buildroot/package/libmbim/libmbim.hash
+@@ -1,2 +1,3 @@
+ # Locally computed:
+ sha256 ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b libmbim-1.14.0.tar.xz
++sha256 c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2 libmbim-1.16.0.tar.xz
+Index: buildroot/package/libmbim/libmbim.mk
+===================================================================
+--- buildroot.orig/package/libmbim/libmbim.mk
++++ buildroot/package/libmbim/libmbim.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBMBIM_VERSION = 1.14.0
++LIBMBIM_VERSION = 1.16.0
+ LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
+ LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
+ LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+Index: buildroot/package/modem-manager/modem-manager.hash
+===================================================================
+--- buildroot.orig/package/modem-manager/modem-manager.hash
++++ buildroot/package/modem-manager/modem-manager.hash
+@@ -1,2 +1,3 @@
+ # Locally computed
+ sha256 e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393 ModemManager-1.6.2.tar.xz
++sha256 d465094fc6fc173354f5a00d212049056829cc245d60a9083f3c53f86a8f90ec ModemManager-1.7.990.tar.xz
+Index: buildroot/package/modem-manager/modem-manager.mk
+===================================================================
+--- buildroot.orig/package/modem-manager/modem-manager.mk
++++ buildroot/package/modem-manager/modem-manager.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-MODEM_MANAGER_VERSION = 1.6.2
++MODEM_MANAGER_VERSION = 1.7.990
+ MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+ MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
+ MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
+Index: buildroot/package/libqmi/libqmi.hash
+===================================================================
+--- buildroot.orig/package/libqmi/libqmi.hash
++++ buildroot/package/libqmi/libqmi.hash
+@@ -1,2 +1,4 @@
+ # Locally computed:
+ sha256 7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a libqmi-1.16.0.tar.xz
++sha256 1e3c5f2968514dc7e333867883889fd0bf17e81ee1e588f17341018ff112cb9f libqmi-1.18.2.tar.xz
++sha256 21428cd3749c56246565123f707fee51238651a22c60bdc85ebce97388626eb4 libqmi-1.20.0.tar.xz
+Index: buildroot/package/libqmi/libqmi.mk
+===================================================================
+--- buildroot.orig/package/libqmi/libqmi.mk
++++ buildroot/package/libqmi/libqmi.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBQMI_VERSION = 1.16.0
++LIBQMI_VERSION = 1.20.0
+ LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
+ LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
+ LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index c6469eb..432e672 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -67,9 +67,13 @@ rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
+rm -rf buildroot/package/libmbim/libmbim.mk
+rm -rf buildroot/package/libmbim/libmbim.hash
rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
+rm -rf buildroot/package/libqmi/libqmi.mk
+rm -rf buildroot/package/libqmi/libqmi.hash
rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
@@ -89,6 +93,8 @@ rm -rf buildroot/package/matiec/matiec.mk
rm -rf buildroot/package/mke2img/Config.in.host
rm -rf buildroot/package/mke2img/mke2img
rm -rf buildroot/package/mke2img/mke2img.mk
+rm -rf buildroot/package/modem-manager/modem-manager.mk
+rm -rf buildroot/package/modem-manager/modem-manager.hash
rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
rm -rf buildroot/package/openssh/openssh.mk
rm -rf buildroot/package/pci_debug/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@sf...> - 2018-02-27 07:32:33
|
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 0e416a283ef7e91547d369c4bc495a918e9aa704 (commit)
from 2a7e7f376ab22c19a551d0663266cb96ea499151 (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 0e416a283ef7e91547d369c4bc495a918e9aa704
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 19 09:18:31 2018 +0100
[LINUX] opos6ulnano: fix patch 0804
-----------------------------------------------------------------------
Summary of changes:
...dts-opos6ulnano-rework-to-support-imx6ull.patch | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch b/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
index 25756c7..2e34658 100644
--- a/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
+++ b/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
@@ -1,7 +1,7 @@
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
===================================================================
---- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+--- linux-4.14.19.orig/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -18,10 +18,10 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
/ {
memory {
reg = <0x80000000 0>; /* will be filled by U-Boot */
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
@@ -104,7 +104,7 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
+ spidev0: spi@0 {
+ compatible = "spidev";
+ reg = <0>;
-+ spi-max-frequency = <5000000>;
++ spi-max-frequency = <60000000>;
+ };
+};
+
@@ -268,10 +268,10 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
+ >;
+ };
+};
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
===================================================================
---- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+--- linux-4.14.19.orig/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -325,7 +325,7 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
- spidev0: spi@0 {
- compatible = "spidev";
- reg = <0>;
-- spi-max-frequency = <5000000>;
+- spi-max-frequency = <60000000>;
- };
-};
-
@@ -489,10 +489,10 @@ Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
- >;
- };
};
-Index: linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
===================================================================
--- /dev/null
-+++ linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
++++ linux-4.14.19/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Armadeus Systems <su...@ar...>
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-02-21 17:09:44
|
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 b7bca5e486ae5a9dab8b59d69f7a36ebcff86411 (commit)
from 88fa93ac39de51e719a4ba41d4df0109f54ea20b (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 b7bca5e486ae5a9dab8b59d69f7a36ebcff86411
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Feb 21 18:09:15 2018 +0100
[TOOLS] Fixes scripts/quiltify.sh for U-Boot with given PATH_DIR in BR
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 7 +++++++
scripts/quiltify.sh | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 8f3a198..b9e5bcd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,8 +86,15 @@ ARMADEUS_LINUX_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_LINUX_PATCH_DIR)
else
ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
endif
+
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
+ifneq ($(BR2_TARGET_UBOOT_PATCH),"")
+TEMP_U_BOOT_PATCH_DIR = $(shell echo $(BR2_TARGET_UBOOT_PATCH) | rev | cut -d " " -f 1 | rev)
+ARMADEUS_U_BOOT_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_U_BOOT_PATCH_DIR))
+else
ARMADEUS_U_BOOT_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/u-boot/$(ARMADEUS_U_BOOT_VERSION)
+endif
+
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
ifneq ($(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE),)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 2bdb160..7a57ec3 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -74,11 +74,10 @@ elif [ "$answer" == "U-Boot" ]; then
QUILT_POST_PATCH_HOOK="cp -pf $ARMADEUS_U_BOOT_CONFIG $ARMADEUS_U_BOOT_DIR/include/configs/"$ARMADEUS_U_BOOT_BOARD_NAME".h"
fi
QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
+ QUILT_TARGET_PATCH_DIR=$ARMADEUS_U_BOOT_PATCH_DIR
if [ "$ARMADEUS_U_BOOT_VERSION" == "custom" ]; then
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_CUSTOM_VERSION
QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_CUSTOM_VERSION"
else
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/u-boot/$ARMADEUS_U_BOOT_VERSION
QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
fi
else
@@ -178,6 +177,12 @@ if [ "$?" != 0 ]; then
fi
# Import patches
+
+if [ ! -d "$QUILT_TARGET_PATCH_DIR" ]; then
+ echo "Patches dir ($QUILT_TARGET_PATCH_DIR) doesn't exist: exiting..."
+ exit 1
+fi
+
pushd $QUILT_TARGET_DIR
if [ "$?" != 0 ]; then
echo "Please correct that ($QUILT_TARGET_DIR)"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@sf...> - 2018-02-16 17:22:24
|
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 2a7e7f376ab22c19a551d0663266cb96ea499151 (commit)
from f17d71bc9af0392c938fea6172eb7b80ee4468a5 (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 2a7e7f376ab22c19a551d0663266cb96ea499151
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 15 19:58:06 2018 +0100
[LINUX] OPOS6ULNANO: 4.14+: set spidev max speed to 60MHz
-----------------------------------------------------------------------
Summary of changes:
...1-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
index a7f54b6..e0945cf 100644
--- a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
+++ b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
@@ -325,7 +325,7 @@ index 0000000..1a542d1
+ spidev0: spi@0 {
+ compatible = "spidev";
+ reg = <0>;
-+ spi-max-frequency = <5000000>;
++ spi-max-frequency = <60000000>;
+ };
+};
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@sf...> - 2018-02-16 08:55:02
|
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 f17d71bc9af0392c938fea6172eb7b80ee4468a5 (commit)
via 786625e2b632be2ada85dd09de433eae7092f106 (commit)
via 40410425d02812990a74c6ff7fd5fa8305448271 (commit)
from b7c87b9ccb1c7f0ffaa0ec465dff09910602bb26 (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 f17d71bc9af0392c938fea6172eb7b80ee4468a5
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 16 10:02:07 2018 +0100
[UBOOT] opos6ulnano: bump to commit 41c5b7e32c6d54742d5d420e14c72517fb5b0640
commit 786625e2b632be2ada85dd09de433eae7092f106
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 15 11:21:31 2018 +0100
[TOOLS] quiltify.sh: fix typo
commit 40410425d02812990a74c6ff7fd5fa8305448271
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 13 16:48:20 2018 +0100
[LINUX] 4.14: opos6ul/opos6ulnano: add i.MX6ULL support
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 4 +-
buildroot/configs/opos6ulnano_defconfig | 10 +-
...ts-opos6ulnano-rework-to-support-imx6ull.patch} | 547 +++++++-------
...us-dts-opos6ul-rework-to-support-imx6ull.patch} | 802 ++++++++++++++-------
...6ull-add-additional-pinfunc-defines-for-i.patch | 64 ++
...-ARM-dts-imx6ull-add-IOMUXC-SNVS-instance.patch | 45 ++
.../0808-ARM-dts-imx6ull-add-UART8-support.patch | 51 ++
...6ul-add-IOMUXC-SNVS-pinctrl-driver-for-i..patch | 115 +++
scripts/quiltify.sh | 2 +-
9 files changed, 1118 insertions(+), 522 deletions(-)
copy patches/linux/{4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch => 4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch} (58%)
copy patches/linux/{4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch => 4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch} (54%)
create mode 100644 patches/linux/4.14/0806-ARM-dts-imx6ull-add-additional-pinfunc-defines-for-i.patch
create mode 100644 patches/linux/4.14/0807-ARM-dts-imx6ull-add-IOMUXC-SNVS-instance.patch
create mode 100644 patches/linux/4.14/0808-ARM-dts-imx6ull-add-UART8-support.patch
create mode 100644 patches/linux/4.14/0809-pinctrl-imx6ul-add-IOMUXC-SNVS-pinctrl-driver-for-i..patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index bd2febb..88aa03f 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,12 +23,12 @@ 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.14.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.19"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.14"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.14.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 50800ae..40f7b25 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -21,12 +21,12 @@ 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.9.35"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.19"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.14"
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"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.14.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulnanodev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulnanodev imx6ull-opos6ulnanodev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -127,7 +127,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="opos6ulnanodev"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="5b608772040dec0638711b6bb7b788da62c38c61"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="41c5b7e32c6d54742d5d420e14c72517fb5b0640"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch b/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
similarity index 58%
copy from patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
copy to patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
index 8234b61..25756c7 100644
--- a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
+++ b/patches/linux/4.14/0804-armadeus-dts-opos6ulnano-rework-to-support-imx6ull.patch
@@ -1,44 +1,30 @@
-From fedc05ba2fc3e6060a6003c1b37d31773c8ccb3a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Thu, 22 Jun 2017 10:28:57 +0200
-Subject: [PATCH 1/1] ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV
- support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-OPOS6ULNano is an i.MX6UL based SoM.
-OPOS6ULNanoDev is a carrier board for the OPOS6ULNano SoM.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi | 194 +++++++++++++++++++++
- arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts | 251 ++++++++++++++++++++++++++++
- 3 files changed, 446 insertions(+)
- 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
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
===================================================================
---- 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 \
- 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
+--- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+@@ -45,8 +45,6 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+-#include "imx6ul.dtsi"
+-
+ / {
+ memory {
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-@@ -0,0 +1,194 @@
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dtsi
+@@ -0,0 +1,245 @@
+/*
-+ * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
@@ -84,212 +70,7 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
-+#include "imx6ul.dtsi"
-+
-+/ {
-+ memory {
-+ reg = <0x80000000 0>; /* will be filled by U-Boot */
-+ };
-+
-+ reg_3v3: regulator-3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ usdhc2_pwrseq: usdhc2-pwrseq {
-+ compatible = "mmc-pwrseq-simple";
-+ reset-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;
-+ };
-+};
-+
-+&fec2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet2>;
-+ phy-mode = "rmii";
-+ phy-reset-duration = <1>;
-+ phy-reset-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
-+ phy-handle = <ðphy1>;
-+ phy-supply = <®_3v3>;
-+ status = "okay";
-+
-+ mdio: mdio {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ ethphy1: ethernet-phy@1 {
-+ compatible = "ethernet-phy-ieee802.3-c22";
-+ reg = <1>;
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
-+ status = "okay";
-+ };
-+ };
-+};
-+
-+/* Bluetooth */
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ bus-width = <8>;
-+ no-1-8-v;
-+ non-removable;
-+ status = "okay";
-+};
-+
-+/* WiFi */
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ bus-width = <4>;
-+ no-1-8-v;
-+ non-removable;
-+ mmc-pwrseq = <&usdhc2_pwrseq>;
-+ status = "okay";
-+
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ brcmf: brcmf@1 {
-+ compatible = "brcm,bcm4329-fmac";
-+ reg = <1>;
-+ /*
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
-+ interrupt-names = "host-wake";
-+ */
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_enet2: enet2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
-+ 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_ENET2_RX_DATA0__ENET2_RDATA00 0x130b0
-+ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
-+ /* INT# */
-+ MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x1b0b0
-+ /* RST# */
-+ MX6UL_PAD_ENET1_TX_DATA0__GPIO2_IO03 0x130b0
-+ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b0
-+ MX6UL_PAD_UART3_RX_DATA__UART3_DCE_RX 0x1b0b0
-+ MX6UL_PAD_UART3_CTS_B__UART3_DCE_CTS 0x1b0b0
-+ MX6UL_PAD_UART3_RTS_B__UART3_DCE_RTS 0x1b0b0
-+ /* BT_REG_ON */
-+ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_usdhc1: usdhc1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
-+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
-+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
-+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
-+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
-+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
-+ MX6UL_PAD_NAND_READY_B__USDHC1_DATA4 0x17059
-+ MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5 0x17059
-+ MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6 0x17059
-+ MX6UL_PAD_NAND_CLE__USDHC1_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__USDHC2_CMD 0x1b0b0
-+ MX6UL_PAD_LCD_DATA19__USDHC2_CLK 0x100b0
-+ MX6UL_PAD_LCD_DATA20__USDHC2_DATA0 0x1b0b0
-+ MX6UL_PAD_LCD_DATA21__USDHC2_DATA1 0x1b0b0
-+ MX6UL_PAD_LCD_DATA22__USDHC2_DATA2 0x1b0b0
-+ MX6UL_PAD_LCD_DATA23__USDHC2_DATA3 0x1b0b0
-+ /* WL_REG_ON */
-+ MX6UL_PAD_NAND_DATA06__GPIO4_IO08 0x130b0
-+ /* WL_IRQ */
-+ MX6UL_PAD_NAND_DATA02__GPIO4_IO04 0x130b0
-+ >;
-+ };
-+};
-Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-===================================================================
---- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-@@ -0,0 +1,251 @@
-+/*
-+ * Copyright 2017 Armadeus Systems <su...@ar...>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ * a) This file is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this file; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ *
-+ * Or, alternatively,
-+ *
-+ * b) Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use,
-+ * copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following
-+ * conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+#include "imx6ul-opos6ulnano.dtsi"
-+
+/ {
-+ model = "Armadeus Systems OPOS6UL Nano SoM on OPOS6ULDev board (customized for OPOS6UL Nano)";
-+ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ul";
-+
+ chosen {
+ stdout-path = &uart1;
+ };
@@ -487,3 +268,285 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ >;
+ };
+};
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+===================================================================
+--- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+@@ -46,206 +46,11 @@
+ */
+
+ /dts-v1/;
++#include "imx6ul.dtsi"
+ #include "imx6ul-opos6ulnano.dtsi"
++#include "imx6ul-opos6ulnanodev.dtsi"
+
+ / {
+- model = "Armadeus Systems OPOS6UL Nano SoM on OPOS6ULDev board (customized for OPOS6UL Nano)";
++ model = "Armadeus Systems OPOS6UL Nano SoM (i.MX6UL) on OPOS6ULDev board (customized for OPOS6UL Nano)";
+ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ul";
+-
+- chosen {
+- stdout-path = &uart1;
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- user-led {
+- label = "User";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_led>;
+- gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+- linux,default-trigger = "heartbeat";
+- };
+- };
+-
+- reg_5v: regulator-5v {
+- compatible = "regulator-fixed";
+- regulator-name = "5V";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- };
+-};
+-
+-&ecspi2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ecspi2>;
+- cs-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+- status = "okay";
+-
+- spidev0: spi@0 {
+- compatible = "spidev";
+- reg = <0>;
+- spi-max-frequency = <5000000>;
+- };
+-};
+-
+-&i2c1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c1>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&lcdif {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_lcdif>;
+- display = <&display0>;
+- lcd-supply = <®_3v3>;
+- status = "okay";
+-
+- display0: display0 {
+- bits-per-pixel = <32>;
+- bus-width = <18>;
+-
+- display-timings {
+- timing0: timing0 {
+- clock-frequency = <33000033>;
+- hactive = <800>;
+- vactive = <480>;
+- hback-porch = <96>;
+- hfront-porch = <96>;
+- vback-porch = <20>;
+- vfront-porch = <21>;
+- hsync-len = <64>;
+- vsync-len = <4>;
+- de-active = <1>;
+- pixelclk-active = <0>;
+- };
+- };
+- };
+-};
+-
+-&snvs_pwrkey {
+- status = "disabled";
+-};
+-
+-&uart1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart1>;
+- status = "okay";
+-};
+-
+-&uart2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart2>;
+- status = "okay";
+-};
+-
+-&usbotg1 {
+- vbus-supply = <®_5v>;
+- dr_mode = "peripheral";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&usbotg2 {
+- vbus-supply = <®_5v>;
+- dr_mode = "host";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_gpios>;
+-
+- pinctrl_ecspi2: ecspi2grp {
+- fsl,pins = <
+- MX6UL_PAD_CSI_DATA00__ECSPI2_SCLK 0x1b0b0
+- MX6UL_PAD_CSI_DATA02__ECSPI2_MOSI 0x1b0b0
+- MX6UL_PAD_CSI_DATA03__ECSPI2_MISO 0x1b0b0
+- MX6UL_PAD_CSI_DATA01__GPIO4_IO22 0x1b0b0
+- >;
+- };
+-
+- pinctrl_gpios: gpiosgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x1b0b0
+- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1b0b0
+- MX6UL_PAD_CSI_MCLK__GPIO4_IO17 0x1b0b0
+- MX6UL_PAD_CSI_PIXCLK__GPIO4_IO18 0x1b0b0
+- MX6UL_PAD_CSI_VSYNC__GPIO4_IO19 0x1b0b0
+- MX6UL_PAD_CSI_HSYNC__GPIO4_IO20 0x1b0b0
+- MX6UL_PAD_CSI_DATA05__GPIO4_IO26 0x1b0b0
+- MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1b0b0
+- >;
+- };
+-
+- pinctrl_i2c1: i2c1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_lcdif: lcdifgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
+- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
+- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
+- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
+- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
+- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
+- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
+- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
+- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
+- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
+- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
+- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
+- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
+- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
+- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
+- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
+- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
+- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
+- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
+- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
+- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
+- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
+- >;
+- };
+-
+- pinctrl_led: ledgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x0b0b0
+- >;
+- };
+-
+- pinctrl_uart1: uart1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+- >;
+- };
+-
+- pinctrl_uart2: uart2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
+- >;
+- };
+ };
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
+===================================================================
+--- /dev/null
++++ linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
+@@ -0,0 +1,56 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "imx6ull.dtsi"
++#include "imx6ul-opos6ulnano.dtsi"
++#include "imx6ul-opos6ulnanodev.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6UL Nano SoM (i.MX6ULL) on OPOS6ULDev board (customized for OPOS6UL Nano)";
++ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ull";
++};
diff --git a/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch
similarity index 54%
copy from patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
copy to patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch
index 51da20b..8ca3210 100644
--- a/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.14/0805-armadeus-dts-opos6ul-rework-to-support-imx6ull.patch
@@ -1,237 +1,445 @@
-From c753be8ed1438150ad427c5d8c84e86f9c70109f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Thu, 2 Jun 2016 18:53:59 +0200
-Subject: [PATCH 1/1] ARM: dts: opos6ul and opos6uldev add initial support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 181 ++++++++++++++
- arch/arm/boot/dts/imx6ul-opos6uldev.dts | 407 ++++++++++++++++++++++++++++++++
- 3 files changed, 589 insertions(+)
- create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
- create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts
-
-Index: linux-4.9.33/arch/arm/boot/dts/Makefile
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
===================================================================
---- linux-4.9.33.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.9.33/arch/arm/boot/dts/Makefile
-@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-14x14-evk.dtb \
- imx6ul-geam-kit.dtb \
-+ imx6ul-opos6uldev.dtb \
- imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
-Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+--- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+@@ -45,8 +45,6 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+-#include "imx6ul.dtsi"
+-
+ / {
+ memory {
+ reg = <0x80000000 0>; /* will be filled by U-Boot */
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dts
===================================================================
---- /dev/null
-+++ linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-@@ -0,0 +1,192 @@
-+/*
-+ * Copyright 2016 Armadeus Systems <su...@ar...>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ * a) This file is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this file; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ *
-+ * Or, alternatively,
-+ *
-+ * b) Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use,
-+ * copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following
-+ * conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
+--- linux-4.14.18.orig/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 2017 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+@@ -46,400 +46,11 @@
+ */
+
+ /dts-v1/;
+#include "imx6ul.dtsi"
-+
-+/ {
-+ memory {
-+ reg = <0x80000000 0>; /* will be filled by U-Boot */
-+ };
-+
-+ reg_3v3: regulator-3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ };
-+
-+ usdhc3_pwrseq: usdhc3_pwrseq {
-+ compatible = "mmc-pwrseq-simple";
-+ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
-+ };
-+};
-+
-+&fec1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet1>;
-+ phy-mode = "rmii";
-+ phy-reset-duration = <1>;
-+ phy-reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
-+ phy-handle = <ðphy1>;
-+ phy-supply = <®_3v3>;
-+ status = "okay";
-+
-+ mdio: mdio {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ ethphy1: ethernet-phy@1 {
-+ compatible = "ethernet-phy-ieee802.3-c22";
-+ reg = <1>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-+ status = "okay";
-+ };
-+ };
-+};
-+
-+/* Bluetooth */
-+&uart8 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart8>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ bus-width = <8>;
-+ no-1-8-v;
-+ non-removable;
-+ status = "okay";
-+};
-+
-+/* WiFi */
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ bus-width = <4>;
-+ no-1-8-v;
-+ non-removable;
-+ mmc-pwrseq = <&usdhc3_pwrseq>;
-+ status = "okay";
-+
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ brcmf: bcrmf@1 {
-+ compatible = "brcm,bcm4329-fmac";
-+ reg = <1>;
-+ interrupt-parent = <&gpio2>;
-+ interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
-+ interrupt-names = "host-wake";
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_enet1: enet1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
-+ MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
-+ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x130b0
-+ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x130b0
-+ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x130b0
-+ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x130b0
-+ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
-+ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
-+ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
-+ /* INT# */
-+ MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x1b0b0
-+ /* RST# */
-+ MX6UL_PAD_NAND_DATA00__GPIO4_IO02 0x130b0
-+ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
-+ >;
-+ };
-+
-+ pinctrl_uart8: uart8grp {
-+ fsl,pins = <
-+ MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX 0x1b0b0
-+ MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS 0x1b0b0
-+ MX6UL_PAD_ENET2_TX_CLK__UART8_DCE_CTS 0x1b0b0
-+ /* BT_REG_ON */
-+ MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x130b0
-+ >;
-+ };
-+
-+ pinctrl_usdhc1: usdhc1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
-+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
-+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
-+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
-+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
-+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
-+ MX6UL_PAD_NAND_READY_B__USDHC1_DATA4 0x17059
-+ MX6UL_PAD_NAND_CE0_B__USDHC1_DATA5 0x17059
-+ MX6UL_PAD_NAND_CE1_B__USDHC1_DATA6 0x17059
-+ MX6UL_PAD_NAND_CLE__USDHC1_DATA7 0x17059
-+ >;
-+ };
-+
-+ pinctrl_usdhc2: usdhc2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__USDHC2_CMD 0x1b0b0
-+ MX6UL_PAD_LCD_DATA19__USDHC2_CLK 0x100b0
-+ MX6UL_PAD_LCD_DATA20__USDHC2_DATA0 0x1b0b0
-+ MX6UL_PAD_LCD_DATA21__USDHC2_DATA1 0x1b0b0
-+ MX6UL_PAD_LCD_DATA22__USDHC2_DATA2 0x1b0b0
-+ MX6UL_PAD_LCD_DATA23__USDHC2_DATA3 0x1b0b0
-+ /* WL_REG_ON */
-+ MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x130b0
-+ /* WL_IRQ */
-+ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x1b0b0
-+ >;
-+ };
-+};
-Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ #include "imx6ul-opos6ul.dtsi"
++#include "imx6ul-opos6uldev.dtsi"
+
+ / {
+- model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+-
+- chosen {
+- stdout-path = &uart1;
+- };
+-
+- backlight {
+- compatible = "pwm-backlight";
+- pwms = <&pwm3 0 191000>;
+- brightness-levels = <0 4 8 16 32 64 128 255>;
+- default-brightness-level = <7>;
+- power-supply = <®_5v>;
+- status = "okay";
+- };
+-
+- gpio-keys {
+- compatible = "gpio-keys";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_gpio_keys>;
+-
+- user-button {
+- label = "User button";
+- gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
+- linux,code = <BTN_MISC>;
+- wakeup-source;
+- };
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- user-led {
+- label = "User";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_led>;
+- gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+- linux,default-trigger = "heartbeat";
+- };
+- };
+-
+- onewire {
+- compatible = "w1-gpio";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_w1>;
+- gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+- };
+-
+- reg_5v: regulator-5v {
+- compatible = "regulator-fixed";
+- regulator-name = "5V";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- };
+-
+- reg_usbotg1_vbus: regulator-usbotg1vbus {
+- compatible = "regulator-fixed";
+- regulator-name = "usbotg1vbus";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg1_vbus>;
+- gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+- enable-active-high;
+- };
+-
+- reg_usbotg2_vbus: regulator-usbotg2vbus {
+- compatible = "regulator-fixed";
+- regulator-name = "usbotg2vbus";
+- regulator-min-microvolt = <5000000>;
+- regulator-max-microvolt = <5000000>;
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg2_vbus>;
+- gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+- enable-active-high;
+- };
+-};
+-
+-&adc1 {
+- vref-supply = <®_3v3>;
+- status = "okay";
+-};
+-
+-&can1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_flexcan1>;
+- xceiver-supply = <®_5v>;
+- status = "okay";
+-};
+-
+-&can2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_flexcan2>;
+- xceiver-supply = <®_5v>;
+- status = "okay";
+-};
+-
+-&ecspi4 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ecspi4>;
+- cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
+- status = "okay";
+-
+- spidev0: spi@0 {
+- compatible = "spidev";
+- reg = <0>;
+- spi-max-frequency = <5000000>;
+- };
+-
+- spidev1: spi@1 {
+- compatible = "spidev";
+- reg = <1>;
+- spi-max-frequency = <5000000>;
+- };
+-};
+-
+-&i2c1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c1>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2>;
+- clock_frequency = <400000>;
+- status = "okay";
+-};
+-
+-&lcdif {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_lcdif>;
+- display = <&display0>;
+- lcd-supply = <®_3v3>;
+- status = "okay";
+-
+- display0: display0 {
+- bits-per-pixel = <32>;
+- bus-width = <18>;
+-
+- display-timings {
+- ST0700 {
+- clock-frequency = <33000033>;
+- hactive = <800>;
+- vactive = <480>;
+- hback-porch = <96>;
+- hfront-porch = <96>;
+- vback-porch = <20>;
+- vfront-porch = <21>;
+- hsync-len = <64>;
+- vsync-len = <4>;
+- 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>;
+- };
+- };
+- };
+-};
+-
+-&pwm3 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_pwm3>;
+- status = "okay";
+-};
+-
+-&snvs_pwrkey {
+- status = "disabled";
+-};
+-
+-&tsc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_tsc>;
+- xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
+- measure-delay-time = <0xffff>;
+- pre-charge-time = <0xffff>;
+- status = "okay";
+-};
+-
+-&uart1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart1>;
+- status = "okay";
+-};
+-
+-&uart2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart2>;
+- status = "okay";
+-};
+-
+-&usbotg1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_usbotg1_id>;
+- vbus-supply = <®_usbotg1_vbus>;
+- dr_mode = "otg";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&usbotg2 {
+- vbus-supply = <®_usbotg2_vbus>;
+- dr_mode = "host";
+- disable-over-current;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- 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
+- MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
+- MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
+- MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
+- MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+- >;
+- };
+-
+- pinctrl_flexcan1: flexcan1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x0b0b0
+- MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_flexcan2: flexcan2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x0b0b0
+- MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpios: gpiosgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
+- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
+- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
+- MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
+- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
+- MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
+- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
+- MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0b0b0
+- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0b0b0
+- >;
+- };
+-
+- pinctrl_gpio_keys: gpiokeysgrp {
+- fsl,pins = <
+- MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+- >;
+- };
+-
+- pinctrl_i2c1: i2c1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+- >;
+- };
+-
+- pinctrl_lcdif: lcdifgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x100b1
+- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x100b1
+- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x100b1
+- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x100b1
+- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x100b1
+- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x100b1
+- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x100b1
+- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x100b1
+- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x100b1
+- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x100b1
+- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x100b1
+- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x100b1
+- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x100b1
+- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x100b1
+- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x100b1
+- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x100b1
+- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x100b1
+- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x100b1
+- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x100b1
+- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x100b1
+- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x100b1
+- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x100b1
+- >;
+- };
+-
+- pinctrl_led: ledgrp {
+- fsl,pins = <
+- MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
+- >;
+- };
+-
+- pinctrl_pwm3: pwm3grp {
+- fsl,pins = <
+- MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
+- >;
+- };
+-
+- pinctrl_tsc: tscgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
+- MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0xb0
+- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
+- MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0
+- >;
+- };
+-
+- pinctrl_uart1: uart1grp {
+- fsl,pins = <
+- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+- >;
+- };
+-
+- pinctrl_uart2: uart2grp {
+- fsl,pins = <
+- MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
+- MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
+- >;
+- };
+-
+- pinctrl_usbotg1_id: usbotg1idgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
+- >;
+- };
+-
+- pinctrl_usbotg1_vbus: usbotg1vbusgrp {
+- fsl,pins = <
+- MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
+- >;
+- };
+-
+- pinctrl_usbotg2_vbus: usbotg2vbusgrp {
+- fsl,pins = <
+- MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
+- >;
+- };
+-
+- pinctrl_w1: w1grp {
+- fsl,pins = <
+- MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
+- >;
+- };
+ };
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -0,0 +1,450 @@
++++ linux-4.14.18/arch/arm/boot/dts/imx6ul-opos6uldev.dtsi
+@@ -0,0 +1,439 @@
+/*
-+ * Copyright 2016 Armadeus Systems <su...@ar...>
++ * Copyright 2018 Armadeus Systems <su...@ar...>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
@@ -277,22 +485,17 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
-+/dts-v1/;
-+#include "imx6ul-opos6ul.dtsi"
-+
+/ {
-+ model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
-+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
-+
+ chosen {
+ stdout-path = &uart1;
+ };
+
-+ lcd_backlight {
++ backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm3 0 191000>;
+ brightness-levels = <0 4 8 16 32 64 128 255>;
+ default-brightness-level = <7>;
++ power-supply = <®_5v>;
+ status = "okay";
+ };
+
@@ -312,7 +515,7 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ leds {
+ compatible = "gpio-leds";
+
-+ user_led {
++ user-led {
+ label = "User";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_led>;
@@ -326,7 +529,6 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_w1>;
+ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
+ };
+
+ reg_5v: regulator-5v {
@@ -359,12 +561,6 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ };
+};
+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
-+ status = "okay";
-+};
-+
+&adc1 {
+ vref-supply = <®_3v3>;
+ status = "okay";
@@ -387,7 +583,6 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+&ecspi4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi4>;
-+ fsl,spi-num-chipselects = <2>;
+ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
@@ -440,8 +635,6 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ vfront-porch = <21>;
+ hsync-len = <64>;
+ vsync-len = <4>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
+ de-active = <1>;
+ pixelclk-active = <0>;
+ };
@@ -465,6 +658,12 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ };
+};
+
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>;
++ status = "okay";
++};
++
+&snvs_pwrkey {
+ status = "disabled";
+};
@@ -510,10 +709,20 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
-+
-+ pinctrl_pwm3: pwm3grp {
++ pinctrl_csi1: csi1grp {
+ fsl,pins = <
-+ MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
++ 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
+ >;
+ };
+
@@ -562,13 +771,7 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ >;
+ };
+
-+ pinctrl_w1: w1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpio_keysgrp {
++ pinctrl_gpio_keys: gpiokeysgrp {
+ fsl,pins = <
+ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+ >;
@@ -621,6 +824,12 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ >;
+ };
+
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6UL_PAD_NAND_ALE__PWM3_OUT 0x1b0b0
++ >;
++ };
++
+ pinctrl_tsc: tscgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
@@ -644,39 +853,88 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+ >;
+ };
+
-+ pinctrl_usbotg1_id: usbotg1_idgrp {
++ pinctrl_usbotg1_id: usbotg1idgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x1b0b0
+ >;
+ };
+
-+ pinctrl_usbotg1_vbus: usbotg1_vbusgrp {
++ pinctrl_usbotg1_vbus: usbotg1vbusgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1b0b0
+ >;
+ };
+
-+ pinctrl_usbotg2_vbus: usbotg2_vbusgrp {
++ pinctrl_usbotg2_vbus: usbotg2vbusgrp {
+ fsl,pins = <
+ MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
+ >;
+ };
+
-+ pinctrl_csi1: csi1grp {
++ pinctrl_w1: w1grp {
+ 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
++ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
+ >;
+ };
++};
+Index: linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+===================================================================
+--- /dev/null
++++ linux-4.14.18/arch/arm/boot/dts/imx6ull-opos6uldev.dts
+@@ -0,0 +1,56 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "imx6ull.dtsi"
++#include "imx6ul-opos6ul.dtsi"
++#include "imx6ul-opos6uldev.dtsi"
+
++/ {
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev board";
++ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
+};
diff --git a/patches/linux/4.14/0806-ARM-dts-imx6ull-add-additional-pinfunc-defines-for-i.patch b/patches/linux/4.14/0806-ARM-dts-imx6ull-add-additional-pinfunc-defines-for-i.patch
new file mode 100644
index 0000000..dd5767a
--- /dev/null
+++ b/patches/linux/4.14/0806-ARM-dts-imx6ull-add-additional-pinfunc-defines-for-i.patch
@@ -0,0 +1,64 @@
+From bc6805f20bd5982bc1bbc747268fdd567e6b9ee6 Mon Sep 17 00:00:00 2001
+From: Bai Ping <pin...@nx...>
+Date: Wed, 10 Jan 2018 22:04:49 +0100
+Subject: [PATCH] ARM: dts: imx6ull: add additional pinfunc defines for i.MX
+ 6ULL
+
+On i.MX 6ULL, the pin MUX and CTRL register of BOOT_MODEx and TAMPERx
+pins are available through IOMUXC_SNVS. Add additional pinfunc defines.
+
+Signed-off-by: Bai Ping <pin...@nx...>
+Signed-off-by: Stefan Agner <st...@ag...>
+Reviewed-by: Rob Herring <ro...@ke...>
+Acked-by: Dong Aisheng <ais...@nx...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+---
+ arch/arm/boot/dts/imx6ull-pinfunc-snvs.h | 26 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx6ull.dtsi | 1 +
+ 2 files changed, 27 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
+
+diff --git a/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
+new file mode 100644
+index 000000000000..f6fb6783c193
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2016 Freescale Semiconductor, Inc.
++ * Copyright (C) 2017 NXP
++ */
++
++#ifndef __DTS_IMX6ULL_PINFUNC_SNVS_H
++#define __DTS_IMX6ULL_PINFUNC_SNVS_H
++/*
++ * The pin function ID is a tuple of
++ * <mux_reg conf_reg input_reg mux_mode input_val>
++ */
++#define MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10 0x0000 0x0044 0x0000 0x5 0x0
++#define MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x0004 0x0048 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0008 0x004C 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x000C 0x0050 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0010 0x0054 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x0014 0x0058 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x0018 0x005C 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x001C 0x0060 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x0020 0x0064 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x0024 0x0068 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x0028 0x006C 0x0000 0x5 0x0
++#define MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x002C 0x0070 0x0000 0x5 0x0
++
++#endif /* __DTS_IMX6ULL_PINFUNC_SNVS_H */
+diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
+index 0c182917b863..a58c01dc15c3 100644
+--- a/arch/arm/boot/dts/imx6ull.dtsi
++++ b/arch/arm/boot/dts/imx6ull.dtsi
+@@ -41,3 +41,4 @@
+
+ #include "imx6ul.dtsi"
+ #include "imx6ull-pinfunc.h"
++#include "imx6ull-pinfunc-snvs.h"
+--
+2.13.6
+
diff --git a/patches/linux/4.14/0807-ARM-dts-imx6ull-add-IOMUXC-SNVS-instance.patch b/patches/linux/4.14/0807-ARM-dts-imx6ull-add-IOMUXC-SNVS-instance.patch
new file mode 100644
index 0000000..8c7b2e9
--- /dev/null
+++ b/patches/linux/4.14/0807-ARM-dts-imx6ull-add-IOMUXC-SNVS-instance.patch
@@ -0,0 +1,45 @@
+From c28bb160662604478d21b744c9525df62445eaf5 Mon Sep 17 00:00:00 2001
+From: Stefan Agner <st...@ag...>
+Date: Wed, 10 Jan 2018 22:04:52 +0100
+Subject: [PATCH] ARM: dts: imx6ull: add IOMUXC SNVS instance
+
+The i.MX 6ULL features another IOMUX Controller called IOMUXC
+SNVS which allows to control BOOT_MODE and TAMPER pins. Add the
+controller to the i.MX 6ULL specific imx6ull.dtsi device tree.
+
+Signed-off-by: Stefan Agner <st...@ag...>
+Reviewed-by: Rob Herring <ro...@ke...>
+Acked-by: Dong Aisheng <ais...@nx...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+---
+ arch/arm/boot/dts/imx6ull.dtsi | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
+index a58c01dc15c3..bc2cd4fb8b12 100644
+--- a/arch/arm/boot/dts/imx6ull.dtsi
++++ b/arch/arm/boot/dts/imx6ull.dtsi
+@@ -42,3 +42,20 @@
+ #include "imx6ul.dtsi"
+ #include "imx6ull-pinfunc.h"
+ #include "imx6ull-pinfunc-snvs.h"
++
++/ {
++ soc {
++ aips3: aips-bus@2200000 {
++ compatible = "fsl,aips-bus", "simple-bus";
++ #address-cells = <1>;
++ #size-cells = <1>;
++ reg = <0x02200000 0x100000>;
++ ranges;
++
++ iomuxc_snvs: iomuxc-snvs@2290000 {
++ compatible = "fsl,imx6ull-iomuxc-snvs";
++ reg = <0x02290000 0x4000>;
++ };
++ };
++ };
++};
+--
+2.13.6
+
diff --git a/patches/linux/4.14/0808-ARM-dts-imx6ull-add-UART8-support.patch b/patches/linux/4.14/0808-ARM-dts-imx6ull-add-UART8-support.patch
new file mode 100644
index 0000000..18af191
--- /dev/null
+++ b/patches/linux/4.14/0808-ARM-dts-imx6ull-add-UART8-support.patch
@@ -0,0 +1,51 @@
+From 71a0febaa443fa5506ba00622047237949b9129d Mon Sep 17 00:00:00 2001
+From: Stefan Agner <st...@ag...>
+Date: Wed, 10 Jan 2018 22:04:53 +0100
+Subject: [PATCH] ARM: dts: imx6ull: add UART8 support
+
+In i.MX 6ULL UART8 is part of the AIPS-3 memory map instead of
+AIPS-1. Clocks and interrupts remain the same.
+
+Signed-off-by: Stefan Agner <st...@ag...>
+Reviewed-by: Rob Herring <ro...@ke...>
+Acked-by: Dong Aisheng <ais...@nx...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+---
+ arch/arm/boot/dts/imx6ull.dtsi | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
+index bc2cd4fb8b12..571ddd71cdba 100644
+--- a/arch/arm/boot/dts/imx6ull.dtsi
++++ b/arch/arm/boot/dts/imx6ull.dtsi
+@@ -43,6 +43,9 @@
+ #include "imx6ull-pinfunc.h"
+ #include "imx6ull-pinfunc-snvs.h"
+
++/* Delete UART8 in AIPS-1 (i.MX6UL specific) */
++/delete-node/ &uart8;
++
+ / {
+ soc {
+ aips3: aips-bus@2200000 {
+@@ -56,6 +59,17 @@
+ compatible = "fsl,imx6ull-iomuxc-snvs";
+ reg = <0x02290000 0x4000>;
+ };
++
++ uart8: serial@2288000 {
++ compatible = "fsl,imx6ul-uart",
++ "fsl,imx6q-uart";
++ reg = <0x02288000 0x4000>;
++ interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
++ clocks = <&clks IMX6UL_CLK_UART8_IPG>,
++ <&clks IMX6UL_CLK_UART8_SERIAL>;
++ clock-names = "ipg", "per";
++ status = "disabled";
++ };
+ };
+ };
+ };
+--
+2.13.6
+
diff --git a/patches/linux/4.14/0809-pinctrl-imx6ul-add-IOMUXC-SNVS-pinctrl-driver-for-i..patch b/patches/linux/4.14/0809-pinctrl-imx6ul-add-IOMUXC-SNVS-pinctrl-driver-for-i..patch
new file mode 100644
index 0000000..0deaccc
--- /dev/null
+++ b/patches/linux/4.14/0809-pinctrl-imx6ul-add-IOMUXC-SNVS-pinctrl-driver-for-i..patch
@@ -0,0 +1,115 @@
+From ba33f4f42e968854d8367fc4e55b07f835c55832 Mon Sep 17 00:00:00 2001
+From: Bai Ping <pin...@nx...>
+Date: Sat, 6 Jan 2018 15:25:53 +0100
+Subject: [PATCH] pinctrl: imx6ul: add IOMUXC SNVS pinctrl driver for i.MX 6ULL
+
+On i.MX 6ULL, the BOOT_MODEx and TAMPERx pin MUX and CTRL registers
+are available in a separate IOMUXC_SNVS module. Add support for the
+IOMUXC_SNVS module to the i.MX 6UL pinctrl driver.
+
+Signed-off-by: Bai Ping <pin...@nx...>
+Signed-off-by: Stefan Agner <st...@ag...>
+Reviewed-by: Rob Herring <ro...@ke...>
+Signed-off-by: Linus Walleij <lin...@li...>
+---
+ .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 3 +-
+ drivers/pinctrl/freescale/pinctrl-imx6ul.c | 52 ++++++++++++++++++++--
+ 2 files changed, 50 insertions(+), 5 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt
+index a81bbf37ed66..7ca4f6118d9a 100644
+--- a/Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt
++++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt
+@@ -4,7 +4,8 @@ Please refer to fsl,imx-pinctrl.txt in this directory for common binding part
+ and usage.
+
+ Required properties:
+-- compatible: "fsl,imx6ul-iomuxc"
++- compatible: "fsl,imx6ul-iomuxc" for main IOMUX controller or
++ "fsl,imx6ull-iomuxc-snvs" for i.MX 6ULL's SNVS IOMUX controller.
+ - fsl,pins: each entry consists of 6 integers and represents the mux and config
+ setting for one pin. The first 5 integers <mux_reg conf_reg input_reg mux_val
+ input_val> are specified using a PIN_FUNC_ID macro, which can be found in
+diff --git a/drivers/pinctrl/freescale/pinctrl-imx6ul.c b/drivers/pinctrl/freescale/pinctrl-imx6ul.c
+index 1aeb840aae1d..4580717ade19 100644
+--- a/drivers/pinctrl/freescale/pinctrl-imx6ul.c
++++ b/drivers/pinctrl/freescale/pinctrl-imx6ul.c
+@@ -150,6 +150,21 @@ enum imx6ul_pads {
+ MX6UL_PAD_CSI_DATA07 = 128,
+ };
+
++enum imx6ull_lpsr_pads {
++ MX6ULL_PAD_BOOT_MODE0 = 0,
++ MX6ULL_PAD_BOOT_MODE1 = 1,
++ MX6ULL_PAD_SNVS_TAMPER0 = 2,
++ MX6ULL_PAD_...
[truncated message content] |