[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-419-gb6ae5d519
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-419-gb6ae5d519
|
From: Sébastien S. <ss...@us...> - 2018-06-18 14:12: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 b6ae5d51902e84a46ecdb3e15c621f96eda03d75 (commit)
from ff499640001df75bacb48cf6bea695e23e11e0c3 (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 b6ae5d51902e84a46ecdb3e15c621f96eda03d75
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 18 16:17:15 2018 +0200
[LINUX] 4.17: add OPOS6ULNano and OPOS6ULNanoDev device trees
-----------------------------------------------------------------------
Summary of changes:
...Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch} | 183 ++++++++++++++++-----
1 file changed, 142 insertions(+), 41 deletions(-)
copy patches/linux/{4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch => 4.17/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch} (66%)
diff --git a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch b/patches/linux/4.17/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
similarity index 66%
copy from patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
copy to patches/linux/4.17/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
index b9dedb158..af62b0e44 100644
--- a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
+++ b/patches/linux/4.17/0104-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6UL.patch
@@ -1,44 +1,31 @@
-From fedc05ba2fc3e6060a6003c1b37d31773c8ccb3a Mon Sep 17 00:00:00 2001
+From b697351b49e58573ec604ce074c3cdd337c78537 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 OPOS6ULNano and
- OPOS6ULNanoDev support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] ARM: dts: add Armadeus Systems OPOS6ULNano and OPOS6ULNanoDEV
+ support
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
+ arch/arm/boot/dts/Makefile | 4 +-
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi | 190 ++++++++++++++++
+ .../boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi | 245 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts | 56 +++++
+ arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts | 56 +++++
+ 5 files changed, 550 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
-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 \
-+ imx6ul-opos6ulnanodev.dtb \
- imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
-Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
===================================================================
--- /dev/null
-+++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-@@ -0,0 +1,192 @@
++++ linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnano.dtsi
+@@ -0,0 +1,190 @@
+/*
-+ * 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,8 +71,6 @@ Index: linux-4.14.19/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 */
@@ -229,13 +214,13 @@ Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ >;
+ };
+};
-Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulnanodev.dtsi
===================================================================
--- /dev/null
-+++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-@@ -0,0 +1,251 @@
++++ linux-4.17.1/arch/arm/boot/dts/imx6ul-imx6ull-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
@@ -281,13 +266,7 @@ Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ * 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;
+ };
@@ -485,3 +464,125 @@ Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+ >;
+ };
+};
+Index: linux-4.17.1/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.1/arch/arm/boot/dts/imx6ul-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 "imx6ul.dtsi"
++#include "imx6ul-imx6ull-opos6ulnano.dtsi"
++#include "imx6ul-imx6ull-opos6ulnanodev.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6UL Nano SoM (i.MX6UL) on OPOS6ULDev board (customized for OPOS6UL Nano)";
++ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ul";
++};
+Index: linux-4.17.1/arch/arm/boot/dts/imx6ull-opos6ulnanodev.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.1/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-imx6ull-opos6ulnano.dtsi"
++#include "imx6ul-imx6ull-opos6ulnanodev.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6UL Nano SoM (i.MX6ULL) on OPOS6ULDev board (customized for OPOS6UL Nano)";
++ compatible = "armadeus,opos6ulnanodev", "armadeus,opos6ulnano", "fsl,imx6ull";
++};
hooks/post-receive
--
armadeus
|