armadeus-commitlog Mailing List for armadeus (Page 20)

Brought to you by: sszy

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

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 153 > >> (Page 20 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-448-geeb613865

From: SÃ©bastien S. <ss...@us...> - 2018-07-11 15:00:43

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  eeb613865798cdffb89e9aced493f35286731e75 (commit)
      from  e50ed4eb9af92e8a91a83356cfac7f3219b6d330 (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 eeb613865798cdffb89e9aced493f35286731e75
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Wed Jul 11 17:10:53 2018 +0200

    [BUILDROOT] 2017.02: linux: Add host-bison and host-flex dependencies
    
    Needed for kernel >= 4.16

-----------------------------------------------------------------------

Summary of changes:
 patches/buildroot/2017.02/233-linux-fix-dependencies.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 patches/buildroot/2017.02/233-linux-fix-dependencies.patch

diff --git a/patches/buildroot/2017.02/233-linux-fix-dependencies.patch b/patches/buildroot/2017.02/233-linux-fix-dependencies.patch
new file mode 100644
index 000000000..b47a9f888
--- /dev/null
+++ b/patches/buildroot/2017.02/233-linux-fix-dependencies.patch
@@ -0,0 +1,13 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -60,7 +60,7 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINU
+ LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES))
+ 
+ LINUX_INSTALL_IMAGES = YES
+-LINUX_DEPENDENCIES += host-kmod
++LINUX_DEPENDENCIES += host-bison host-flex host-kmod
+ 
+ # host tools needed for kernel compression
+ ifeq ($(BR2_LINUX_KERNEL_LZ4),y)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-447-ge50ed4eb9

From: SÃ©bastien S. <ss...@us...> - 2018-07-09 12:24:43

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  e50ed4eb9af92e8a91a83356cfac7f3219b6d330 (commit)
      from  81d67edea04ac4e8505b666418bf50c185c1672c (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 e50ed4eb9af92e8a91a83356cfac7f3219b6d330
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Mon Jul 9 14:34:59 2018 +0200

    [LINUX] opos6ul: add dual ethernet device trees

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul_defconfig                |   2 +-
 ...deus-add-opos6uldev-dual-ethernet-support.patch | 244 +++++++++++++++++++++
 2 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch

diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 632678e4e..3599f9e73 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -27,7 +27,7 @@ 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
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
diff --git a/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch b/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
new file mode 100644
index 000000000..3f40b0c3f
--- /dev/null
+++ b/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
@@ -0,0 +1,244 @@
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.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-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
++
++/ {
++	model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev dual Ethernet board";
++	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
++};
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.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-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
++
++/ {
++	model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev dual Ethernet board";
++	compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
++};
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+@@ -0,0 +1,117 @@
++/*
++ * 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.
++ */
++
++#include "imx6ul-imx6ull-opos6uldev.dtsi"
++
++/ {
++	/delete-node/ gpio-keys;
++	/delete-node/ sound;
++};
++
++&fec2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet2>;
++	phy-mode = "rmii";
++	phy-reset-duration = <1>;
++	phy-reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++	phy-handle = <&ethphy2>;
++	phy-supply = <&reg_3v3>;
++	status = "okay";
++};
++
++&mdio {
++	ethphy2: ethernet-phy@2 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <2>;
++		interrupt-parent = <&gpio1>;
++		interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
++		status = "okay";
++	};
++};
++
++&sai2 {
++	/delete-property/ pinctrl-names;
++	/delete-property/ pinctrl-0;
++	status = "disabled";
++};
++
++&uart8 {
++	/delete-property/ pinctrl-names;
++	/delete-property/ pinctrl-0;
++	status = "disabled";
++};
++
++&usdhc2 {
++	/delete-property/ pinctrl-names;
++	/delete-property/ pinctrl-0;
++	status = "disabled";
++
++	/delete-node/ wifi;
++};
++
++&iomuxc {
++	/delete-node/ gpiokeysgrp;
++	/delete-node/ uart8grp;
++	/delete-node/ usdhc2grp;
++
++	pinctrl_enet2: enet2grp {
++		fsl,pins = <
++			MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2	0x4001b031
++			MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER	0x130b0
++			MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00	0x130b0
++			MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01	0x130b0
++			MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN	0x130b0
++			MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN	0x1b0b0
++			MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00	0x1b0b0
++			MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01	0x1b0b0
++			/* INT# */
++			MX6UL_PAD_JTAG_TDI__GPIO1_IO13		0x1b0b0
++			/* RST# */
++			MX6UL_PAD_JTAG_TDO__GPIO1_IO12		0x130b0
++		>;
++	};
++};


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-446-g81d67edea

From: Julien B a. A. <ar...@us...> - 2018-07-05 16:05: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  81d67edea04ac4e8505b666418bf50c185c1672c (commit)
      from  d323fdd969afc4a8bff0ae3e04091de81b2a709e (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 81d67edea04ac4e8505b666418bf50c185c1672c
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Thu Jul 5 18:04:32 2018 +0200

    [BUILDROOT] replace apf51_defconfig with apf51mainline_defconfig and update apf51test_defconfig accordingly

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf51_defconfig         | 24 ++++----
 buildroot/configs/apf51mainline_defconfig | 98 -------------------------------
 buildroot/configs/apf51test_defconfig     | 12 +++-
 3 files changed, 23 insertions(+), 111 deletions(-)
 delete mode 100644 buildroot/configs/apf51mainline_defconfig

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 94e164684..9d58e4c04 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -6,8 +6,8 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -29,13 +29,6 @@ BR2_TARGET_ARMADEUS=y
 BR2_BOARD_NAME="apf51"
 BR2_CPU_NAME="imx51"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_FPGA_FIRMWARE=y
@@ -59,6 +52,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
 BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_LIBXML2=y
 BR2_PACKAGE_BLUEZ3_UTILS=y
@@ -68,7 +63,6 @@ BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
@@ -92,3 +86,13 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
 BR2_TARGET_UBOOT_ENVIMAGE=y
 BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
 BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
deleted file mode 100644
index 9d58e4c04..000000000
--- a/buildroot/configs/apf51mainline_defconfig
+++ /dev/null
@@ -1,98 +0,0 @@
-BR2_arm=y
-BR2_cortex_a8=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf51"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf51 imx51"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf51"
-BR2_CPU_NAME="imx51"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_TFP410CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
-BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBXML2=y
-BR2_PACKAGE_BLUEZ3_UTILS=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_PPPD=y
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 8e669e8fb..94d4e8d28 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -6,8 +6,8 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -31,11 +31,14 @@ BR2_CPU_NAME="imx51"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_AS_DEVICES=y
@@ -104,6 +107,7 @@ BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_JFFS2DUMP=y
 BR2_PACKAGE_MTD_MKFSJFFS2=y
 BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_FBV=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
 BR2_PACKAGE_DBUS=y
@@ -111,6 +115,8 @@ BR2_PACKAGE_GPSD=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBV4L_UTILS=y
 # BR 2013.11:


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-445-gd323fdd96

From: SÃ©bastien S. <ss...@us...> - 2018-07-04 15:39: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  d323fdd969afc4a8bff0ae3e04091de81b2a709e (commit)
       via  05ed379476c5b8e8f526ad90f4499c4d697ef272 (commit)
      from  88a379712658d47eb13ba13bb008eebdae13a4f7 (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 d323fdd969afc4a8bff0ae3e04091de81b2a709e
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Wed Jul 4 17:45:21 2018 +0200

    [U-BOOT] opos6ul/opos6ulnano: bump to 6599a0ebbd68e13c29a0cb325c03718eb987a7f1

commit 05ed379476c5b8e8f526ad90f4499c4d697ef272
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Wed Jul 4 17:40:21 2018 +0200

    [LINUX] opos6ulnano: bump to 4.17.4

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul-preempt-rt_defconfig                    | 8 +++++---
 buildroot/configs/opos6ul_defconfig                               | 2 +-
 buildroot/configs/opos6ullegacy-4.1_defconfig                     | 2 +-
 buildroot/configs/opos6ullegacy-4.9_defconfig                     | 2 +-
 buildroot/configs/opos6ulnano-preempt-rt_defconfig                | 2 +-
 buildroot/configs/opos6ulnano_defconfig                           | 8 ++++----
 .../opos6ulnano-linux-4.17.config}                                | 0
 7 files changed, 13 insertions(+), 11 deletions(-)
 copy buildroot/target/device/armadeus/{opos6ul/opos6ul-linux-4.17.config => opos6ulnano/opos6ulnano-linux-4.17.config} (100%)

diff --git a/buildroot/configs/opos6ul-preempt-rt_defconfig b/buildroot/configs/opos6ul-preempt-rt_defconfig
index 4af863088..ce299c368 100644
--- a/buildroot/configs/opos6ul-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ul-preempt-rt_defconfig
@@ -124,9 +124,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="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
+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/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 197f8f21b..632678e4e 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -129,7 +129,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="2e56ba2a9c03584305e01146b945ffc11842fd33"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index d05518d8f..1174f748e 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -161,7 +161,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="2e56ba2a9c03584305e01146b945ffc11842fd33"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index 6055ce973..40fe874a0 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -167,7 +167,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="2e56ba2a9c03584305e01146b945ffc11842fd33"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index 436cb3962..9cda52793 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -124,7 +124,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="eac402feb5a4132665fec84ed243c1008011c8f2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index c487d74e6..da6c9e3f0 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,10 +22,10 @@ BR2_CPU_NAME="imx6ul"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.19"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4"
+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.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-opos6ulnanodev imx6ull-opos6ulnanodev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -131,7 +131,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="41c5b7e32c6d54742d5d420e14c72517fb5b0640"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6599a0ebbd68e13c29a0cb325c03718eb987a7f1"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ulnanodev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config b/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-4.17.config
similarity index 100%
copy from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
copy to buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-4.17.config


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-443-g88a379712

From: Julien B a. A. <ar...@us...> - 2018-07-04 15:15:19

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  88a379712658d47eb13ba13bb008eebdae13a4f7 (commit)
       via  9d190ff3a61f949609674a1b355170b3db613cc5 (commit)
       via  9954085379e17c5ce3221613c6e23351b3bb07a4 (commit)
       via  71494e21bd7541bd6aa634bd17543cd9fa0c6b80 (commit)
       via  9de58d2765d4b1b11b809fd95c43affbffab852b (commit)
       via  26595d25fc3e88ec09e4f35a654f385a9d22fd66 (commit)
       via  d82b68ced68c8c3cc6af55d5a14fc5a189ecc391 (commit)
       via  997bfe77f86bee76c54ddaceb82b585e4cfff5aa (commit)
      from  0dfeeb273a931adce05996a084fdffb729fb82c4 (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 88a379712658d47eb13ba13bb008eebdae13a4f7
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:42:21 2018 +0200

    [BUILDROOT] remove apf9328*_defconfig (do not build anymore)

commit 9d190ff3a61f949609674a1b355170b3db613cc5
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:40:32 2018 +0200

    [BUILDROOT] rename apf28mainline*_defconfig -> apf28*_defconfig

commit 9954085379e17c5ce3221613c6e23351b3bb07a4
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:39:11 2018 +0200

    [BUILDROOT] rename apf28test_defconfig -> apf28legacytest_defconfig

commit 71494e21bd7541bd6aa634bd17543cd9fa0c6b80
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:38:05 2018 +0200

    [BUILDROOT] rename apf28_defconfig -> apf28legacy_defconfig

commit 9de58d2765d4b1b11b809fd95c43affbffab852b
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:36:20 2018 +0200

    [BUILDROOT] replace apf27xenomai_defconfig with apf27xenomaimainline_defconfig

commit 26595d25fc3e88ec09e4f35a654f385a9d22fd66
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:34:22 2018 +0200

    [BUILDROOT] remove apf27_webradio_defconfig (do not build anymore)

commit d82b68ced68c8c3cc6af55d5a14fc5a189ecc391
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:32:55 2018 +0200

    [BUILDROOT] rename /apf27preempt-rtmainline_defconfig -> apf27preempt-rt_defconfig

commit 997bfe77f86bee76c54ddaceb82b585e4cfff5aa
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:31:10 2018 +0200

    [BUILDROOT] Update apf27test_defconfig with mainline kernel

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf27_webradio_defconfig         |  94 ------------
 ...ainline_defconfig => apf27preempt-rt_defconfig} |   0
 buildroot/configs/apf27test_defconfig              |  19 ++-
 buildroot/configs/apf27xenomai_defconfig           |  29 ++--
 buildroot/configs/apf27xenomaimainline_defconfig   |  92 ------------
 buildroot/configs/apf28_defconfig                  |  32 ++--
 .../{apf28_defconfig => apf28legacy_defconfig}     |   0
 ...f28test_defconfig => apf28legacytest_defconfig} |   0
 buildroot/configs/apf28mainline_defconfig          |  86 -----------
 buildroot/configs/apf28mainlinetest_defconfig      | 162 ---------------------
 buildroot/configs/apf28test_defconfig              |  39 ++---
 buildroot/configs/apf9328_defconfig                |  70 ---------
 buildroot/configs/apf9328test_defconfig            | 130 -----------------
 buildroot/configs/apf9328xenomai_defconfig         |  75 ----------
 14 files changed, 62 insertions(+), 766 deletions(-)
 delete mode 100644 buildroot/configs/apf27_webradio_defconfig
 rename buildroot/configs/{apf27preempt-rtmainline_defconfig => apf27preempt-rt_defconfig} (100%)
 delete mode 100644 buildroot/configs/apf27xenomaimainline_defconfig
 copy buildroot/configs/{apf28_defconfig => apf28legacy_defconfig} (100%)
 copy buildroot/configs/{apf28test_defconfig => apf28legacytest_defconfig} (100%)
 delete mode 100644 buildroot/configs/apf28mainline_defconfig
 delete mode 100644 buildroot/configs/apf28mainlinetest_defconfig
 delete mode 100644 buildroot/configs/apf9328_defconfig
 delete mode 100644 buildroot/configs/apf9328test_defconfig
 delete mode 100644 buildroot/configs/apf9328xenomai_defconfig

diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
deleted file mode 100644
index 89f359457..000000000
--- a/buildroot/configs/apf27_webradio_defconfig
+++ /dev/null
@@ -1,94 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf27"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf27 imx27"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf27"
-BR2_CPU_NAME="imx27"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_AD9889CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_PYWEBRADIO=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_PYTHON_PYGAME=y
-BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_FONT=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_NET=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_PYEXPAT=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_PORTMAP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf27preempt-rtmainline_defconfig b/buildroot/configs/apf27preempt-rt_defconfig
similarity index 100%
rename from buildroot/configs/apf27preempt-rtmainline_defconfig
rename to buildroot/configs/apf27preempt-rt_defconfig
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 963828a21..6d787de92 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -5,8 +5,8 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -18,9 +18,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +29,14 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_AS_DEVICES=y
@@ -112,6 +114,8 @@ BR2_PACKAGE_GPSD=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBV4L_UTILS=y
 # BR 2013.11:
@@ -143,6 +147,7 @@ BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_NTP_NTPDATE=y
 BR2_PACKAGE_RPCBIND=y
+BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
@@ -164,7 +169,7 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index eaffb3be3..b7173c595 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -4,9 +4,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_KERNEL_HEADERS_3_14=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -18,9 +16,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,13 +27,16 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.39"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.29-xenomai.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION)-xenomai.config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
 BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.39-arm-9.patch"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_FPGA_FIRMWARE=y
@@ -57,6 +57,8 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_DROPBEAR=y
@@ -66,13 +68,12 @@ BR2_PACKAGE_NTP=y
 BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
-BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=mx2"
+BR2_PACKAGE_XENOMAI_VERSION="2.6.4"
 BR2_PACKAGE_XENOMAI_TESTSUITE=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
@@ -83,7 +84,7 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
deleted file mode 100644
index b7173c595..000000000
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ /dev/null
@@ -1,92 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_3_14=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf27"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf27 imx27"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf27"
-BR2_CPU_NAME="imx27"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.39"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION)-xenomai.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
-BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.39-arm-9.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_AD9889CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_XENOMAI_VERSION="2.6.4"
-BR2_PACKAGE_XENOMAI_TESTSUITE=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 28ad78c5d..5191b865c 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -4,22 +4,19 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_KERNEL_HEADERS_4_9=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_4_8_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +27,13 @@ BR2_CPU_NAME="imx28"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
-BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.65"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
+BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
 BR2_PACKAGE_IMXREGS=y
@@ -42,26 +41,24 @@ BR2_PACKAGE_GDB=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 # BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
 BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_ZLIB=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
 BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPERF=y
 BR2_PACKAGE_IPERF3=y
 BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_LRZSZ=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
@@ -81,7 +78,8 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_SB=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
 BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28legacy_defconfig
similarity index 100%
copy from buildroot/configs/apf28_defconfig
copy to buildroot/configs/apf28legacy_defconfig
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28legacytest_defconfig
similarity index 100%
copy from buildroot/configs/apf28test_defconfig
copy to buildroot/configs/apf28legacytest_defconfig
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
deleted file mode 100644
index 5191b865c..000000000
--- a/buildroot/configs/apf28mainline_defconfig
+++ /dev/null
@@ -1,86 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_4_9=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_GCC_VERSION_4_8_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf28"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf28 imx28"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf28"
-BR2_CPU_NAME="imx28"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.65"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
-BR2_LINUX_KERNEL_DEFCONFIG="mxs"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_INPUT_TOOLS=y
-# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPERF3=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-# BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_SB=y
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28mainlinetest_defconfig b/buildroot/configs/apf28mainlinetest_defconfig
deleted file mode 100644
index 47bacef82..000000000
--- a/buildroot/configs/apf28mainlinetest_defconfig
+++ /dev/null
@@ -1,162 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_GCC_VERSION_4_8_X=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf28"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf28 imx28"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf28"
-BR2_CPU_NAME="imx28"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_AS_DEVICES=y
-BR2_PACKAGE_AS_DEVICES_TESTS=y
-BR2_PACKAGE_AS_DEVICES_CPP=y
-BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_DEMOS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
-BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_TESTSUITE=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_FFPLAY=y
-BR2_PACKAGE_GSTREAMER=y
-BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
-BR2_PACKAGE_GST_PLUGINS_GOOD=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST_PLUGINS_BAD=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
-BR2_PACKAGE_GST_PLUGINS_UGLY=y
-BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
-BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_LMBENCH=y
-BR2_PACKAGE_LTRACE=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_DOOM_WAD=y
-BR2_PACKAGE_LBREAKOUT2=y
-BR2_PACKAGE_OPENTYRIAN=y
-BR2_PACKAGE_PRBOOM=y
-BR2_PACKAGE_SLIDESHOW=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FB_TEST_APP=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_SDL_GFX=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_SOUND=y
-BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
-BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
-# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
-# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_READLINE=y
-BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_READLINE=y
-BR2_PACKAGE_PYTHON_PYGAME=y
-BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
-BR2_PACKAGE_PYTHON_PYGAME_FONT=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
-BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
-BR2_PACKAGE_PYTHON_SERIAL=y
-BR2_PACKAGE_SPEEX=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBXML2=y
-BR2_PACKAGE_BLUEZ_UTILS=y
-BR2_PACKAGE_BLUEZ_UTILS_COMPAT=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPERF3=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-BR2_PACKAGE_LIGHTTPD_LUA=y
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_PPPD=y
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-# BR2_TARGET_UBOOT_FORMAT_BIN is not set
-BR2_TARGET_UBOOT_FORMAT_SB=y
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index d0a2ca73a..47bacef82 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -5,21 +5,20 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_PTHREAD_DEBUG=y
+BR2_GCC_VERSION_4_8_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +29,14 @@ BR2_CPU_NAME="imx28"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
-BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_AS_DEVICES=y
 BR2_PACKAGE_AS_DEVICES_TESTS=y
@@ -69,6 +71,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
 BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
 BR2_PACKAGE_GST_PLUGINS_UGLY=y
 BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
+BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MPLAYER=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_LMBENCH=y
@@ -77,15 +80,15 @@ BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_DOOM_WAD=y
 BR2_PACKAGE_LBREAKOUT2=y
 BR2_PACKAGE_OPENTYRIAN=y
-BR2_PACKAGE_DOOM_WAD=y
 BR2_PACKAGE_PRBOOM=y
 BR2_PACKAGE_SLIDESHOW=y
 BR2_PACKAGE_FBDUMP=y
 BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBV=y
 BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBV=y
 BR2_PACKAGE_SDL_GFX=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
 BR2_PACKAGE_SDL_SOUND=y
@@ -97,15 +100,8 @@ BR2_PACKAGE_INPUT_TOOLS=y
 # BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
 # BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
 BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
-# BR 2013.11:
-#BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
-#BR2_PACKAGE_LIBV4L_V4L2_DBG=y
 BR2_PACKAGE_LUA=y
 BR2_PACKAGE_LUA_READLINE=y
-# BR 2013.11:
-#BR2_PACKAGE_LUA_INTERPRETER_READLINE
 BR2_PACKAGE_PYTHON=y
 BR2_PACKAGE_PYTHON_READLINE=y
 BR2_PACKAGE_PYTHON_PYGAME=y
@@ -115,7 +111,11 @@ BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
 BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
 BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_SPEEX=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBUSB=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_LIBXML2=y
 BR2_PACKAGE_BLUEZ_UTILS=y
@@ -137,11 +137,11 @@ BR2_PACKAGE_RPCBIND=y
 BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
@@ -154,7 +154,8 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_SB=y
 BR2_TARGET_UBOOT_ENVIMAGE=y
 BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
deleted file mode 100644
index bbf015dd0..000000000
--- a/buildroot/configs/apf9328_defconfig
+++ /dev/null
@@ -1,70 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NANO=y
-BR2_PACKAGE_RPCBIND=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
deleted file mode 100644
index 3bca812d2..000000000
--- a/buildroot/configs/apf9328test_defconfig
+++ /dev/null
@@ -1,130 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_AS_DEVICES=y
-BR2_PACKAGE_AS_DEVICES_TESTS=y
-BR2_PACKAGE_AS_DEVICES_CPP=y
-BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
-BR2_PACKAGE_DEMOS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_TESTSUITE=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MPLAYER=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_LTRACE=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_FBDUMP=y
-BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
-BR2_PACKAGE_FBV=y
-BR2_PACKAGE_FB_TEST_APP=y
-BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_IMAGE_JPEG=y
-BR2_PACKAGE_SDL_IMAGE_PNG=y
-BR2_PACKAGE_SDL_SOUND=y
-BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
-BR2_PACKAGE_SDL_NET=y
-BR2_PACKAGE_SDL_GFX=y
-BR2_PACKAGE_SLIDESHOW=y
-BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_READLINE=y
-# BR 2013.11:
-#BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBFFI=y
-BR2_PACKAGE_BOA=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
diff --git a/buildroot/configs/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
deleted file mode 100644
index f02de9c6e..000000000
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ /dev/null
@@ -1,75 +0,0 @@
-BR2_arm=y
-BR2_arm920t=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf9328 imxl"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf9328"
-BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_CH7024CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
-BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=imx"
-BR2_PACKAGE_XENOMAI_TESTSUITE=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-435-g0dfeeb273

From: Julien B a. A. <ar...@us...> - 2018-07-04 14:24:34

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  0dfeeb273a931adce05996a084fdffb729fb82c4 (commit)
      from  d951785c0d33b1880da966755ff7c2f6cf26b4d2 (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 0dfeeb273a931adce05996a084fdffb729fb82c4
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jul 4 16:23:47 2018 +0200

    [DEMOS] capture: add possibility to crop camera input and move cropping zone dynamically

-----------------------------------------------------------------------

Summary of changes:
 target/demos/camera/capture/capture.c | 107 +++++++++++++++++++++++++++-------
 1 file changed, 85 insertions(+), 22 deletions(-)

diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index dd98045bb..db46a930e 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -84,8 +84,11 @@ struct camera mycamera;
 
 unsigned int force_yuv420 = 0;
 unsigned int force_fps = 0;
+unsigned int force_crop = 0;
 unsigned int video_input = 0;
 unsigned int capture_mode = 0;
+unsigned int crop_width = 0;
+unsigned int crop_height = 0;
 
 #define FOURCC_TO_STR(fmt) fmt & 0xff, (fmt >> 8) & 0xff, (fmt >> 16) & 0xff, (fmt >> 24) & 0xff
 
@@ -605,6 +608,45 @@ static int read_frame(void)
 	return 1;
 }
 
+static int do_cropping(unsigned int xoff, unsigned int yoff, unsigned int factor)
+{
+	struct v4l2_cropcap cropcap;
+	struct v4l2_crop crop;
+	struct v4l2_rect cropping;
+
+	CLEAR(cropcap);
+	cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+	cropping.left = xoff;
+	cropping.top = yoff;
+	cropping.width = crop_width + factor;
+	cropping.height = crop_height + factor;
+
+	if (0 == xioctl(v4l_fd, VIDIOC_CROPCAP, &cropcap)) {
+		crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+		if (!force_crop)
+			crop.c = cropcap.defrect; /* reset to default */
+		else
+			crop.c = cropping;
+
+		if (-1 == xioctl(v4l_fd, VIDIOC_S_CROP, &crop)) {
+			switch (errno) {
+				case EINVAL:
+				/* Cropping not supported. */
+				break;
+			default:
+				/* Errors ignored. */
+				break;
+			}
+		}
+	} else {
+		fprintf(stderr, "Camera (driver) doesn't support cropping\n");
+		/* Errors ignored. */
+	}
+
+	return 0;
+}
+
 static int go_on = 1;
 static int pause_capture = 0;
 
@@ -613,6 +655,9 @@ static void mainloop(void)
 	SDL_Event event;
 	struct stat exec_stat;
 	int ret;
+	static unsigned int xoff = 0;
+	static unsigned int yoff = 0;
+	static unsigned int factor = 0;
 
         while (go_on) {
 		{
@@ -665,9 +710,35 @@ static void mainloop(void)
 						case SDLK_SPACE:
 							pause_capture = pause_capture ? 0 : 1;
 							break;
+						case SDLK_LEFT:
+							xoff -= 10;
+							break;
+						case SDLK_RIGHT:
+							xoff += 10;
+							break;
+						case SDLK_UP:
+							yoff -= 10;
+							break;
+						case SDLK_DOWN:
+							yoff += 10;
+							break;
+						case SDLK_PAGEUP:
+							factor += 64;
+							break;
+						case SDLK_PAGEDOWN:
+							factor -= 64;
+							break;
 						default:
 							break;
 					}
+					if (xoff >= 500)
+						xoff = 0;
+					if (yoff >= 500)
+						yoff = 0;
+					if (factor >= 500)
+						factor = 0;
+					do_cropping(xoff, yoff, factor);
+
 					break;
 
 				case SDL_QUIT:
@@ -1098,27 +1169,7 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
 
 	select_video_input();
 
-	CLEAR(cropcap);
-        cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        if (0 == xioctl (v4l_fd, VIDIOC_CROPCAP, &cropcap)) {
-                crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                crop.c = cropcap.defrect; /* reset to default */
-
-                if (-1 == xioctl(v4l_fd, VIDIOC_S_CROP, &crop)) {
-                        switch (errno) {
-                        case EINVAL:
-                                /* Cropping not supported. */
-                                break;
-                        default:
-                                /* Errors ignored. */
-                                break;
-                        }
-                }
-        } else {	
-                /* Errors ignored. */
-        }
-
+	do_cropping(0, 0, 0);
 
         CLEAR(fmt);
 	fmt.fmt.pix.pixelformat = get_a_supported_pix_fmt();
@@ -1211,6 +1262,9 @@ static void usage(FILE *fp, int argc, char **argv)
 	fprintf (fp,
 		"Usage: %s [options]\n\n"
 		"Options:\n"
+		"  -c | --crop WxH        Crop camera input to WxH. In this mode, "
+					"offset can be changed with arrow keys "
+					"and window size with pageup/down (USB keyboard)\n"
 		"  -d | --device name     Video device name [/dev/video0]\n"
 		"  -h | --help            Print this message\n"
 		"  -i | --input           Use given video input (if many, 0 by default)\n"
@@ -1230,9 +1284,10 @@ static void usage(FILE *fp, int argc, char **argv)
 		argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
 }
 
-static const char short_options [] = "d:hi:mo:ruwtf:bxy";
+static const char short_options [] = "c:d:hi:mo:ruwtf:bxy";
 
 static const struct option long_options [] = {
+	{ "crop",	required_argument,	NULL,	'c' },
 	{ "verbose",	no_argument,		NULL,	'b' },
 	{ "device",	required_argument,	NULL,	'd' },
 	{ "fps",	required_argument,	NULL,	'f' },
@@ -1303,6 +1358,14 @@ int main(int argc, char **argv)
                         debug = 1;
                         break;
 
+		case 'c':
+			force_crop = 1;
+			sscanf(optarg, "%dx%d", &crop_width, &crop_height);
+			if (debug)
+				fprintf(stdout, "cropping to %dx%d\n",
+						crop_width, crop_height);
+			break;
+
                 case 'd':
                         dev_name = optarg;
                         break;


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-434-gd951785c0

From: Julien B a. A. <ar...@us...> - 2018-07-03 16:18:25

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  d951785c0d33b1880da966755ff7c2f6cf26b4d2 (commit)
       via  09cabb2d6b8fe2b2b54e8f3e453940c651e479bb (commit)
      from  9be0c4371386efa2506dcc316e420491d0d6cbfc (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 d951785c0d33b1880da966755ff7c2f6cf26b4d2
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Tue Jul 3 18:17:29 2018 +0200

    [DEMOS] capture: fixes YUV420 -> grayscale decoding and fps selection when forcing YUV420 mode

commit 09cabb2d6b8fe2b2b54e8f3e453940c651e479bb
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Tue Jul 3 18:05:18 2018 +0200

    [DEMOS] capture: allow to pause/restart stream when pressing SPACE key

-----------------------------------------------------------------------

Summary of changes:
 target/demos/camera/capture/capture.c | 65 +++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 56ce8a395..dd98045bb 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -89,6 +89,9 @@ unsigned int capture_mode = 0;
 
 #define FOURCC_TO_STR(fmt) fmt & 0xff, (fmt >> 8) & 0xff, (fmt >> 16) & 0xff, (fmt >> 24) & 0xff
 
+static void start_capturing(void);
+static void stop_capturing(void);
+
 static void errno_exit(const char *s)
 {
 	fprintf(stderr, "%s error %d, %s\n", s, errno, strerror (errno));
@@ -329,15 +332,13 @@ static void yuv420_to_rgb32(void *yuv, int size, void *rgb)
 	int nbpix = mycamera.width * mycamera.height;
 	Uint16 *dest16 = (Uint16*) rgb;
 	Uint32 *dest32 = (Uint32*) rgb;
-	Uint32 *src = (Uint32*) yuv;
+	Uint8 *src = (Uint8*) yuv;
 
 	nbpix = mycamera.width * mycamera.height;
-	for (i=nbpix/4; i; i--) {
-		yuv32 = *(src++);
-		for (j=0; j<4; j++) {
-			R = G = B = (&yuv32)[j];
-			*(dest32++) = (R << 16) | (G << 8) | (B);
-		}
+	for (i=nbpix; i; i--) {
+		yuv8 = *(src++);
+		R = G = B = yuv8;
+		*(dest32++) = (R << 16) | (G << 8) | (B); /* BGRA */
 	}
 }
 
@@ -614,7 +615,7 @@ static void mainloop(void)
 	int ret;
 
         while (go_on) {
-                for (;;) {
+		{
                         fd_set fds;
                         struct timeval tv;
                         int r;
@@ -640,11 +641,9 @@ static void mainloop(void)
                                 exit (EXIT_FAILURE);
                         }
 
-			if (read_frame())
-                    		break;
-	
-			/* EAGAIN - continue select loop. */
+			read_frame();
                 }
+
 		while (SDL_PollEvent(&event)) {
 			switch (event.type)
 			{
@@ -662,20 +661,37 @@ static void mainloop(void)
 				}
 
 				case SDL_KEYDOWN:
+					switch (event.key.keysym.sym) {
+						case SDLK_SPACE:
+							pause_capture = pause_capture ? 0 : 1;
+							break;
+						default:
+							break;
+					}
+					break;
+
 				case SDL_QUIT:
 					go_on = 0;
 					break;
 			}
 		}
-		while (pause_capture)
-			SDL_Delay(500);
+
+		if (pause_capture)
+			stop_capturing();
+		else
+			start_capturing();
         }
 }
 
+static int stream_on = 0;
+
 static void stop_capturing(void)
 {
         enum v4l2_buf_type type;
 
+	if (!stream_on)
+		goto stop_end;
+
 	switch (io) {
 	case IO_METHOD_READ:
 		/* Nothing to do. */
@@ -690,6 +706,10 @@ static void stop_capturing(void)
 
 		break;
 	}
+	stream_on = 0;
+
+stop_end:
+	return;
 }
 
 static void start_capturing(void)
@@ -697,6 +717,9 @@ static void start_capturing(void)
         unsigned int i;
         enum v4l2_buf_type type;
 
+	if (stream_on)
+		goto start_end;
+
 	switch (io) {
 	case IO_METHOD_READ:
 		/* Nothing to do. */
@@ -746,6 +769,11 @@ static void start_capturing(void)
 
 		break;
 	}
+
+	stream_on = 1;
+
+start_end:
+	return;
 }
 
 static void uninit_device(void)
@@ -1093,9 +1121,8 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
 
 
         CLEAR(fmt);
-	if (!force_yuv420) {
-		fmt.fmt.pix.pixelformat = get_a_supported_pix_fmt();
-	} else {
+	fmt.fmt.pix.pixelformat = get_a_supported_pix_fmt();
+	if (force_yuv420) {
 		fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;
 	}
 	if (!fmt.fmt.pix.pixelformat) {
@@ -1231,11 +1258,11 @@ static void signal_handler(int signal)
 		go_on = 0;
 
 	if (signal == SIGUSR1) {
-		printf("Starting capture\n");
+		printf("Asked to start capture from external app\n");
 		pause_capture = 0;
 	}
 	if (signal == SIGUSR2) {
-		printf("Stopping capture\n");
+		printf("Asked to stop capture from external app\n");
 		pause_capture = 1;
 	}
 }


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-432-g9be0c4371

From: SÃ©bastien S. <ss...@us...> - 2018-07-03 13:58: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  9be0c4371386efa2506dcc316e420491d0d6cbfc (commit)
      from  503311327929a488cc7c6f8fd9aefff46c5b3d6f (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 9be0c4371386efa2506dcc316e420491d0d6cbfc
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue Jul 3 16:09:59 2018 +0200

    [LINUX] opos6ul: bump to 4.17.4

-----------------------------------------------------------------------

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 b6e50224f..197f8f21b 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4"
 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"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-431-g503311327

From: SÃ©bastien S. <ss...@us...> - 2018-07-03 09:40:43

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  503311327929a488cc7c6f8fd9aefff46c5b3d6f (commit)
      from  9d0e52c1475bbd76a26d683b92d59db5b5e4b879 (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 503311327929a488cc7c6f8fd9aefff46c5b3d6f
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue Jul 3 11:50:00 2018 +0200

    [LINUX] 4.17/4.9.legacy: opos6uldev: add SGTL5000 support on JTAG header

-----------------------------------------------------------------------

Summary of changes:
 .../opos6ul-linux-4.1.legacy.config.fragment       |   3 +
 .../armadeus/opos6ul/opos6ul-linux-4.17.config     |   1 +
 ...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 113 +++++++++++++++++++++
 ...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 113 +++++++++++++++++++++
 4 files changed, 230 insertions(+)
 create mode 100644 patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch

diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
index a7c3a239f..3999253e6 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
@@ -1 +1,4 @@
 CONFIG_SPI_SPIDEV=m
+# CONFIG_SND_SOC_IMX_SGTL5000 is not set
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SIMPLE_CARD=y
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
index e5b726274..1289aed2b 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
@@ -251,6 +251,7 @@ CONFIG_SND_SOC_FSL_ASRC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_FSL_ASOC_CARD=y
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
new file mode 100644
index 000000000..a95b6faff
--- /dev/null
+++ b/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
@@ -0,0 +1,113 @@
+Index: linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+===================================================================
+--- linux-4.17.2.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -91,6 +91,13 @@
+ 		gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+ 	};
+ 
++	reg_1v8: regulator-1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++	};
++
+ 	reg_5v: regulator-5v {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "5V";
+@@ -119,6 +126,31 @@
+ 		gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+ 		enable-active-high;
+ 	};
++
++	sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,name = "imx6ul-opos6ul-sgtl5000-audio";
++		simple-audio-card,widgets =
++			"Microphone", "Mic Jack",
++			"Line", "Line In",
++			"Line", "Line Out",
++			"Headphone", "Headphone Jack";
++		simple-audio-card,routing =
++			"MIC_IN", "Mic Jack",
++			"Mic Jack", "Mic Bias",
++			"Headphone Jack", "HP_OUT";
++
++		simple-audio-card,format = "i2s";
++		simple-audio-card,bitclock-master = <&codec_dai>;
++		simple-audio-card,frame-master = <&codec_dai>;
++		simple-audio-card,cpu {
++			sound-dai = <&sai2>;
++		};
++		codec_dai: simple-audio-card,codec {
++			sound-dai = <&sgtl5000>;
++			clocks = <&clks IMX6UL_CLK_SAI2>;
++		};
++	};
+ };
+ 
+ &adc1 {
+@@ -140,6 +172,11 @@
+ 	status = "okay";
+ };
+ 
++&clks {
++	assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++	assigned-clock-rates = <786432000>;
++};
++
+ &ecspi4 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_ecspi4>;
+@@ -164,6 +201,16 @@
+ 	pinctrl-0 = <&pinctrl_i2c1>;
+ 	clock_frequency = <400000>;
+ 	status = "okay";
++
++	sgtl5000: codec@0a {
++		compatible = "fsl,sgtl5000";
++		reg = <0x0a>;
++		#sound-dai-cells = <0>;
++		VDDD-supply = <&reg_1v8>;
++		VDDA-supply = <&reg_3v3>;
++		VDDIO-supply = <&reg_3v3>;
++		clocks = <&clks IMX6UL_CLK_SAI2>;
++	};
+ };
+ 
+ &i2c2 {
+@@ -224,6 +271,16 @@
+ 	status = "okay";
+ };
+ 
++&sai2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_sai2>;
++	assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>, <&clks IMX6UL_CLK_SAI2>;
++	assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++	assigned-clock-rates = <0>, <24576000>;
++	fsl,sai-mclk-direction-output;
++	status = "okay";
++};
++
+ &snvs_pwrkey {
+ 	status = "disabled";
+ };
+@@ -390,6 +447,16 @@
+ 		>;
+ 	};
+ 
++	pinctrl_sai2: sai2grp {
++		fsl,pins = <
++			MX6UL_PAD_JTAG_TMS__SAI2_MCLK           0x17088
++			MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK        0x17088
++			MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC        0x17088
++			MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA     0x11088
++			MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA        0x11088
++		>;
++	};
++
+ 	pinctrl_tsc: tscgrp {
+ 		fsl,pins = <
+ 			MX6UL_PAD_GPIO1_IO01__GPIO1_IO01       0xb0
diff --git a/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
new file mode 100644
index 000000000..a95b6faff
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
@@ -0,0 +1,113 @@
+Index: linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+===================================================================
+--- linux-4.17.2.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -91,6 +91,13 @@
+ 		gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+ 	};
+ 
++	reg_1v8: regulator-1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++	};
++
+ 	reg_5v: regulator-5v {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "5V";
+@@ -119,6 +126,31 @@
+ 		gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+ 		enable-active-high;
+ 	};
++
++	sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,name = "imx6ul-opos6ul-sgtl5000-audio";
++		simple-audio-card,widgets =
++			"Microphone", "Mic Jack",
++			"Line", "Line In",
++			"Line", "Line Out",
++			"Headphone", "Headphone Jack";
++		simple-audio-card,routing =
++			"MIC_IN", "Mic Jack",
++			"Mic Jack", "Mic Bias",
++			"Headphone Jack", "HP_OUT";
++
++		simple-audio-card,format = "i2s";
++		simple-audio-card,bitclock-master = <&codec_dai>;
++		simple-audio-card,frame-master = <&codec_dai>;
++		simple-audio-card,cpu {
++			sound-dai = <&sai2>;
++		};
++		codec_dai: simple-audio-card,codec {
++			sound-dai = <&sgtl5000>;
++			clocks = <&clks IMX6UL_CLK_SAI2>;
++		};
++	};
+ };
+ 
+ &adc1 {
+@@ -140,6 +172,11 @@
+ 	status = "okay";
+ };
+ 
++&clks {
++	assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++	assigned-clock-rates = <786432000>;
++};
++
+ &ecspi4 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_ecspi4>;
+@@ -164,6 +201,16 @@
+ 	pinctrl-0 = <&pinctrl_i2c1>;
+ 	clock_frequency = <400000>;
+ 	status = "okay";
++
++	sgtl5000: codec@0a {
++		compatible = "fsl,sgtl5000";
++		reg = <0x0a>;
++		#sound-dai-cells = <0>;
++		VDDD-supply = <&reg_1v8>;
++		VDDA-supply = <&reg_3v3>;
++		VDDIO-supply = <&reg_3v3>;
++		clocks = <&clks IMX6UL_CLK_SAI2>;
++	};
+ };
+ 
+ &i2c2 {
+@@ -224,6 +271,16 @@
+ 	status = "okay";
+ };
+ 
++&sai2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_sai2>;
++	assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>, <&clks IMX6UL_CLK_SAI2>;
++	assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++	assigned-clock-rates = <0>, <24576000>;
++	fsl,sai-mclk-direction-output;
++	status = "okay";
++};
++
+ &snvs_pwrkey {
+ 	status = "disabled";
+ };
+@@ -390,6 +447,16 @@
+ 		>;
+ 	};
+ 
++	pinctrl_sai2: sai2grp {
++		fsl,pins = <
++			MX6UL_PAD_JTAG_TMS__SAI2_MCLK           0x17088
++			MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK        0x17088
++			MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC        0x17088
++			MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA     0x11088
++			MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA        0x11088
++		>;
++	};
++
+ 	pinctrl_tsc: tscgrp {
+ 		fsl,pins = <
+ 			MX6UL_PAD_GPIO1_IO01__GPIO1_IO01       0xb0


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-430-g9d0e52c14

From: SÃ©bastien S. <ss...@us...> - 2018-07-02 12:48: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  9d0e52c1475bbd76a26d683b92d59db5b5e4b879 (commit)
       via  edd75024cfe0a88f325dbb13dc0f05ecefe59c0a (commit)
      from  a6888a6eb31bedd013bb4774031652e1b1acf205 (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 9d0e52c1475bbd76a26d683b92d59db5b5e4b879
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Mon Jul 2 14:58:15 2018 +0200

    [BUILDROOT] 2017.02: update cleanup_buildroot.sh

commit edd75024cfe0a88f325dbb13dc0f05ecefe59c0a
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Mon Jul 2 14:54:32 2018 +0200

    [BUILDROOT] 2017.02/2018.02: bump stress-ng
    
    It makes it build with opos6ul_defconfig

-----------------------------------------------------------------------

Summary of changes:
 .../2017.02/040-armadeus-bump-stress-ng-version.patch        | 12 ++++++------
 patches/buildroot/2017.02/cleanup_buildroot.sh               |  2 +-
 .../2018.02/040-armadeus-bump-stress-ng-version.patch        | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch b/patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch
index ed21a0925..e4322f070 100644
--- a/patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch
+++ b/patches/buildroot/2017.02/040-armadeus-bump-stress-ng-version.patch
@@ -6,21 +6,21 @@ Index: buildroot/package/stress-ng/stress-ng.hash
 ===================================================================
 --- buildroot.orig/package/stress-ng/stress-ng.hash
 +++ buildroot/package/stress-ng/stress-ng.hash
-@@ -1,2 +1,4 @@
+@@ -1,2 +1,2 @@
  # Locally calculated
- sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
-+# Locally calculated
-+sha256	e3b357c8bcdcf1ec577a3e9a02bfd949cf0ba6ff40a0a96ceb0b0fa5fd761729  	stress-ng-0.08.08.tar.gz
+-sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
++sha256  0de97212a83b2f8a34ee31ef32a7bc69066ed49ebdc59b51aa4060cb95e29321  stress-ng-0.09.32.tar.xz
 Index: buildroot/package/stress-ng/stress-ng.mk
 ===================================================================
 --- buildroot.orig/package/stress-ng/stress-ng.mk
 +++ buildroot/package/stress-ng/stress-ng.mk
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,8 @@
  #
  ################################################################################
  
 -STRESS_NG_VERSION = 0.06.15
-+STRESS_NG_VERSION = 0.08.08
++STRESS_NG_VERSION = 0.09.32
++STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
  STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
  STRESS_NG_LICENSE = GPLv2+
  STRESS_NG_LICENSE_FILES = COPYING
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 0c1ca60cf..afa886e8e 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -38,7 +38,6 @@ 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
@@ -94,6 +93,7 @@ rm -rf buildroot/package/qt/0009-Fix-library-inclusion-order-when-building-stati
 rm -rf buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
 rm -rf buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
 #
+rm -rf buildroot/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.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
diff --git a/patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch b/patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch
index ed21a0925..e4322f070 100644
--- a/patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch
+++ b/patches/buildroot/2018.02/040-armadeus-bump-stress-ng-version.patch
@@ -6,21 +6,21 @@ Index: buildroot/package/stress-ng/stress-ng.hash
 ===================================================================
 --- buildroot.orig/package/stress-ng/stress-ng.hash
 +++ buildroot/package/stress-ng/stress-ng.hash
-@@ -1,2 +1,4 @@
+@@ -1,2 +1,2 @@
  # Locally calculated
- sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
-+# Locally calculated
-+sha256	e3b357c8bcdcf1ec577a3e9a02bfd949cf0ba6ff40a0a96ceb0b0fa5fd761729  	stress-ng-0.08.08.tar.gz
+-sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
++sha256  0de97212a83b2f8a34ee31ef32a7bc69066ed49ebdc59b51aa4060cb95e29321  stress-ng-0.09.32.tar.xz
 Index: buildroot/package/stress-ng/stress-ng.mk
 ===================================================================
 --- buildroot.orig/package/stress-ng/stress-ng.mk
 +++ buildroot/package/stress-ng/stress-ng.mk
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,8 @@
  #
  ################################################################################
  
 -STRESS_NG_VERSION = 0.06.15
-+STRESS_NG_VERSION = 0.08.08
++STRESS_NG_VERSION = 0.09.32
++STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
  STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
  STRESS_NG_LICENSE = GPLv2+
  STRESS_NG_LICENSE_FILES = COPYING


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-428-ga6888a6eb

From: Julien B a. A. <ar...@us...> - 2018-06-29 13:27:01

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  a6888a6eb31bedd013bb4774031652e1b1acf205 (commit)
      from  e862eeb35b8a1b75bc7d3f5dbef364e6bdf4ffaa (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 a6888a6eb31bedd013bb4774031652e1b1acf205
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Fri Jun 29 15:25:46 2018 +0200

    [DEMOS] capture: add an option to choose camera framerate. Rename some options to fit new one. Fixes fps calculation while we are at it...

-----------------------------------------------------------------------

Summary of changes:
 target/demos/camera/capture/capture.c | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 3cdf68b55..56ce8a395 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -83,6 +83,7 @@ struct camera {
 struct camera mycamera;
 
 unsigned int force_yuv420 = 0;
+unsigned int force_fps = 0;
 unsigned int video_input = 0;
 unsigned int capture_mode = 0;
 
@@ -974,8 +975,11 @@ end_of_fmt:
 	if (capture_mode) {
 		CLEAR(parm);
 		parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-		parm.parm.capture.timeperframe.numerator = 30;
-		parm.parm.capture.timeperframe.denominator = 1;
+		parm.parm.capture.timeperframe.numerator = 1;
+		if (force_fps)
+			parm.parm.capture.timeperframe.denominator = force_fps;
+		else
+			parm.parm.capture.timeperframe.denominator = 30;
 		parm.parm.capture.capturemode = capture_mode;
 		fprintf(stdout, "Forcing sensor capture mode to %d\n", capture_mode);
 		if (ioctl(v4l_fd, VIDIOC_S_PARM, &parm) < 0) {
@@ -1192,16 +1196,19 @@ static void usage(FILE *fp, int argc, char **argv)
 		"  --cam_width W          Use W as camera picture width (instead of %d)\n"
 		"  --cam_height H         Use H as camera picture height (instead of %d)\n"
 		"  --use_vpu IP           Uses processor VPU to encode video (at camera size) and send it to IP addr\n"
-		"  -f | --force           Forces YUV420/YU12 format on camera\n"
+		"  -y | --yuv             Forces YUV420/YU12 format on camera\n"
 		"  -b | --verbose         Display some debug informations\n"
+		"  -f | --fps N           Choose fps (depends on camera sensor, actually 15 or 30 (default))\n"
 		"",
 		argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
 }
 
-static const char short_options [] = "d:hi:mo:ruwtfb";
+static const char short_options [] = "d:hi:mo:ruwtf:bxy";
 
 static const struct option long_options [] = {
+	{ "verbose",	no_argument,		NULL,	'b' },
 	{ "device",	required_argument,	NULL,	'd' },
+	{ "fps",	required_argument,	NULL,	'f' },
 	{ "help",	no_argument,		NULL,	'h' },
 	{ "input",	required_argument,	NULL,	'i' },
 	{ "mmap",	no_argument,		NULL,	'm' },
@@ -1210,11 +1217,10 @@ static const struct option long_options [] = {
 	{ "userp",	no_argument,		NULL,	'u' },
 	{ "width",	required_argument,	NULL,	'w' },
 	{ "height",	required_argument,	NULL,	't' },
-	{ "cam_width",	required_argument,	NULL,	'y' },
+	{ "cam_width",	required_argument,	NULL,	'x' },
+	{ "yuv",	no_argument,		NULL,	'y' },
 	{ "cam_height",	required_argument,	NULL,	'z' },
 	{ "use_vpu",	required_argument,	NULL,	'v' },
-	{ "force",	no_argument,		NULL,	'f' },
-	{ "verbose",	no_argument,		NULL,	'b' },
 	{ 0, 0, 0, 0 }
 };
 
@@ -1274,9 +1280,11 @@ int main(int argc, char **argv)
                         dev_name = optarg;
                         break;
 
-                case 'f':
-                        force_yuv420 = 1;
-                        break;
+		case 'f':
+			force_fps = atoi(optarg);
+			if (force_fps != 30)
+				force_fps = 15;
+			break;
 
                 case 'h':
                         usage(stdout, argc, argv);
@@ -1315,10 +1323,14 @@ int main(int argc, char **argv)
 			height = atoi(optarg);
 			break;
 
-		case 'y':
+		case 'x':
 			camwidth = atoi(optarg);
 			break;
 
+		case 'y':
+			force_yuv420 = 1;
+			break;
+
 		case 'z':
 			camheight = atoi(optarg);
 			break;


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-427-ge862eeb35

From: Julien B a. A. <ar...@us...> - 2018-06-27 17:33:21

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  e862eeb35b8a1b75bc7d3f5dbef364e6bdf4ffaa (commit)
       via  272f6a695c45661ecd4d49844b5060d94f4b250b (commit)
       via  42365f4ac961500b8a4d7b42a035f264b7f8dc52 (commit)
       via  dfd98a7cf6447d35513f38888201dbc1ebe47a48 (commit)
      from  8a52d62f1ce933abc0065aa17ac07cf5fda36917 (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 e862eeb35b8a1b75bc7d3f5dbef364e6bdf4ffaa
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jun 27 19:31:13 2018 +0200

    [DEMOS] capture: add possibilities to choose SoC input mode and sensor capture mode (mostly of use on i.MX6 and OV5640)

commit 272f6a695c45661ecd4d49844b5060d94f4b250b
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jun 27 15:43:57 2018 +0200

    [DEMOS] capture: cleanup & trace improving

commit 42365f4ac961500b8a4d7b42a035f264b7f8dc52
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jun 27 15:41:22 2018 +0200

    [PACKAGES] Add a tool to read/modify OV5640 registers from userspace

commit dfd98a7cf6447d35513f38888201dbc1ebe47a48
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Mon Jun 4 15:11:15 2018 +0200

    [BUILDROOT] 2017.02.x: update cleanup_buildroot.sh

-----------------------------------------------------------------------

Summary of changes:
 patches/buildroot/2017.02/cleanup_buildroot.sh |  13 +-
 target/demos/camera/capture/capture.c          | 188 +++++++++++-----
 target/packages/ov5640ctrl/Makefile            |  27 +++
 target/packages/ov5640ctrl/ov5640.c            | 290 +++++++++++++++++++++++++
 4 files changed, 465 insertions(+), 53 deletions(-)
 create mode 100644 target/packages/ov5640ctrl/Makefile
 create mode 100644 target/packages/ov5640ctrl/ov5640.c

diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 0aba335e8..0c1ca60cf 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -79,9 +79,20 @@ 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
+# For 2017.02.5 -> 2017.02.1x 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/qt/0001-configure.patch
+rm -rf buildroot/package/qt/0002-eglwsegl-use-system.patch
+rm -rf buildroot/package/qt/0003-fix-const-atomics.patch
+rm -rf buildroot/package/qt/0004-pthread_getattr_np.patch
+rm -rf buildroot/package/qt/0005-script-qtdbus-no-gui.patch
+rm -rf buildroot/package/qt/0006-Add-initial-support-of-ARC-architecture.patch
+rm -rf buildroot/package/qt/0007-Prevent-unaligned-access-on-ARC.patch
+rm -rf buildroot/package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch
+rm -rf buildroot/package/qt/0009-Fix-library-inclusion-order-when-building-statically.patch
+rm -rf buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
+rm -rf buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.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
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index f0ce152b2..3cdf68b55 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -61,12 +61,12 @@ struct buffer {
 	size_t offset;
 };
 
-static char *dev_name	= NULL;
-static char *ip_addr	= "192.168.0.2";
-static io_method	io		= IO_METHOD_MMAP;
-static int              fd              = -1;
-struct buffer *         buffers         = NULL;
-static unsigned int     n_buffers       = 0;
+static char *dev_name = NULL;
+static char *ip_addr = "192.168.0.2";
+static io_method io = IO_METHOD_MMAP;
+static int v4l_fd = -1;
+struct buffer *buffers = NULL;
+static unsigned int n_buffers = 0;
 int g_use_codec = 0;
 static int debug = 0;
 
@@ -83,6 +83,8 @@ struct camera {
 struct camera mycamera;
 
 unsigned int force_yuv420 = 0;
+unsigned int video_input = 0;
+unsigned int capture_mode = 0;
 
 #define FOURCC_TO_STR(fmt) fmt & 0xff, (fmt >> 8) & 0xff, (fmt >> 16) & 0xff, (fmt >> 24) & 0xff
 
@@ -504,7 +506,7 @@ static int read_frame(void)
 
 	switch (io) {
 	case IO_METHOD_READ:
-    		if (-1 == read(fd, buffers[0].start, buffers[0].length)) {
+		if (-1 == read(v4l_fd, buffers[0].start, buffers[0].length)) {
             		switch (errno) {
             		case EAGAIN:
                     		return 0;
@@ -529,7 +531,7 @@ static int read_frame(void)
             	buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
             	buf.memory = V4L2_MEMORY_MMAP;
 
-    		if (-1 == xioctl(fd, VIDIOC_DQBUF, &buf)) {
+		if (-1 == xioctl(v4l_fd, VIDIOC_DQBUF, &buf)) {
             		switch (errno) {
             		case EAGAIN:
                     		return 0;
@@ -557,7 +559,7 @@ static int read_frame(void)
 // 		else
 		process_image(buffers[buf.index].start, buf.length);
 
-		if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
+		if (-1 == xioctl(v4l_fd, VIDIOC_QBUF, &buf))
 			errno_exit("VIDIOC_QBUF");
 
 		break;
@@ -568,7 +570,7 @@ static int read_frame(void)
     		buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     		buf.memory = V4L2_MEMORY_USERPTR;
 
-		if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) {
+		if (-1 == xioctl(v4l_fd, VIDIOC_DQBUF, &buf)) {
 			switch (errno) {
 			case EAGAIN:
 				return 0;
@@ -592,7 +594,7 @@ static int read_frame(void)
 
 		process_image((void *) buf.m.userptr, 0);
 
-		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+		if (-1 == xioctl(v4l_fd, VIDIOC_QBUF, &buf))
 			errno_exit ("VIDIOC_QBUF");
 
 		break;
@@ -617,13 +619,13 @@ static void mainloop(void)
                         int r;
 
                         FD_ZERO (&fds);
-                        FD_SET (fd, &fds);
+                        FD_SET (v4l_fd, &fds);
 
                         /* Timeout. */
                         tv.tv_sec = 2;
                         tv.tv_usec = 0;
 
-                        r = select(fd + 1, &fds, NULL, NULL, &tv);
+                        r = select(v4l_fd + 1, &fds, NULL, NULL, &tv);
 
                         if (-1 == r) {
                                 if (EINTR == errno)
@@ -682,7 +684,7 @@ static void stop_capturing(void)
 	case IO_METHOD_USERPTR:
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-		if (-1 == xioctl (fd, VIDIOC_STREAMOFF, &type))
+		if (-1 == xioctl(v4l_fd, VIDIOC_STREAMOFF, &type))
 			errno_exit ("VIDIOC_STREAMOFF");
 
 		break;
@@ -709,13 +711,13 @@ static void start_capturing(void)
         		buf.memory      = V4L2_MEMORY_MMAP;
         		buf.index       = i;
 
-        		if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+			if (-1 == xioctl(v4l_fd, VIDIOC_QBUF, &buf))
                     		errno_exit ("VIDIOC_QBUF");
 		}
 		
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-		if (-1 == xioctl (fd, VIDIOC_STREAMON, &type))
+		if (-1 == xioctl(v4l_fd, VIDIOC_STREAMON, &type))
 			errno_exit ("VIDIOC_STREAMON");
 
 		break;
@@ -732,13 +734,13 @@ static void start_capturing(void)
 			buf.m.userptr	= (unsigned long) buffers[i].start;
 			buf.length      = buffers[i].length;
 
-			if (-1 == xioctl (fd, VIDIOC_QBUF, &buf))
+			if (-1 == xioctl(v4l_fd, VIDIOC_QBUF, &buf))
                     		errno_exit ("VIDIOC_QBUF");
 		}
 
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-		if (-1 == xioctl (fd, VIDIOC_STREAMON, &type))
+		if (-1 == xioctl(v4l_fd, VIDIOC_STREAMON, &type))
 			errno_exit ("VIDIOC_STREAMON");
 
 		break;
@@ -797,7 +799,7 @@ static void init_mmap(void)
         req.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         req.memory              = V4L2_MEMORY_MMAP;
 
-	if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
+	if (-1 == xioctl(v4l_fd, VIDIOC_REQBUFS, &req)) {
                 if (EINVAL == errno) {
                         fprintf (stderr, "%s does not support "
                                  "memory mapping\n", dev_name);
@@ -829,7 +831,7 @@ static void init_mmap(void)
                 buf.memory      = V4L2_MEMORY_MMAP;
                 buf.index       = n_buffers;
 
-                if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf))
+                if (-1 == xioctl(v4l_fd, VIDIOC_QUERYBUF, &buf))
                         errno_exit ("VIDIOC_QUERYBUF");
 
                 buffers[n_buffers].length = buf.length;
@@ -839,7 +841,7 @@ static void init_mmap(void)
                               buf.length,
                               PROT_READ | PROT_WRITE /* required */,
                               MAP_SHARED /* recommended */,
-                              fd, buf.m.offset);
+                              v4l_fd, buf.m.offset);
 		/*printf("### start= 0x%08x offset=0x%08x\n", (unsigned int)(buffers[n_buffers].start), buffers[n_buffers].offset);*/
                 if (MAP_FAILED == buffers[n_buffers].start)
                         errno_exit ("mmap");
@@ -860,7 +862,7 @@ static void init_userp(unsigned int buffer_size)
         req.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         req.memory              = V4L2_MEMORY_USERPTR;
 
-        if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
+        if (-1 == xioctl(v4l_fd, VIDIOC_REQBUFS, &req)) {
                 if (EINVAL == errno) {
                         fprintf (stderr, "%s does not support "
                                  "user pointer i/o\n", dev_name);
@@ -892,6 +894,9 @@ static void init_userp(unsigned int buffer_size)
 static Uint32 get_a_supported_pix_fmt(void)
 {
 	struct v4l2_fmtdesc fmtdesc;
+	struct v4l2_frmsizeenum fszenum;
+	struct v4l2_streamparm parm;
+	Uint32 ret = 0;
 	int i;
 
 	/* First check if a LCD native format is available (-> no need for CSC) */
@@ -899,18 +904,21 @@ static Uint32 get_a_supported_pix_fmt(void)
 		CLEAR(fmtdesc);
 		fmtdesc.index = i;
 		fmtdesc.type  = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-		if (-1 == ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc))
+		if (-1 == ioctl(v4l_fd, VIDIOC_ENUM_FMT, &fmtdesc))
 			break;
 		if (debug) {
-			fprintf(stdout, "Trying format %d %c%c%c%c (%s)\n",
-				fmtdesc.index, FOURCC_TO_STR(fmtdesc.pixelformat),
-				fmtdesc.description);
+			fprintf(stdout, "Camera supports %c%c%c%c (%s) as format %d\n",
+				FOURCC_TO_STR(fmtdesc.pixelformat),
+				fmtdesc.description,
+				fmtdesc.index
+				);
 		}
 		if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) ||
 			 (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32) ||
 			 (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ) {
-			fprintf(stdout, "Using img format (%d %c%c%c%c)\n", i, FOURCC_TO_STR(fmtdesc.pixelformat));
-			return fmtdesc.pixelformat;
+			fprintf(stdout, "Using camera format %d (%c%c%c%c)\n", i, FOURCC_TO_STR(fmtdesc.pixelformat));
+			ret = fmtdesc.pixelformat;
+			goto end_of_fmt;
 		}
 	}
 
@@ -919,7 +927,7 @@ static Uint32 get_a_supported_pix_fmt(void)
 		CLEAR(fmtdesc);
 		fmtdesc.index = i;
 		fmtdesc.type  = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-		if (-1 == ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc))
+		if (-1 == ioctl(v4l_fd, VIDIOC_ENUM_FMT, &fmtdesc))
 			break;
 
 		if ((fmtdesc.pixelformat == V4L2_PIX_FMT_YUYV)
@@ -938,11 +946,74 @@ static Uint32 get_a_supported_pix_fmt(void)
 			else
 				fprintf(stdout, "??? \n");
 
-			return fmtdesc.pixelformat;
+			ret = fmtdesc.pixelformat;
+			goto end_of_fmt;
 		}
 	}
 
-	return 0;
+end_of_fmt:
+
+	fprintf(stdout, "For selected pixel format, camera supports "
+				"following framesizes:\n");
+	for (i = 0;; i++) {
+		CLEAR(fszenum);
+		fszenum.index = i;
+		fszenum.pixel_format = fmtdesc.pixelformat;
+		if (-1 == ioctl(v4l_fd, VIDIOC_ENUM_FRAMESIZES, &fszenum)) {
+			break;
+		} else {
+			fprintf(stdout, "- number %d of type %d (%dx%d)\n",
+				fszenum.index,
+				fszenum.type,
+				fszenum.discrete.width,
+				fszenum.discrete.height
+			);
+		}
+	}
+
+	if (capture_mode) {
+		CLEAR(parm);
+		parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+		parm.parm.capture.timeperframe.numerator = 30;
+		parm.parm.capture.timeperframe.denominator = 1;
+		parm.parm.capture.capturemode = capture_mode;
+		fprintf(stdout, "Forcing sensor capture mode to %d\n", capture_mode);
+		if (ioctl(v4l_fd, VIDIOC_S_PARM, &parm) < 0) {
+			fprintf(stderr, "VIDIOC_S_PARM failed: %s", strerror(errno));
+		}
+	}
+
+	return ret;
+}
+
+static void select_video_input(void)
+{
+	struct v4l2_input input;
+	int i = 0;
+	int selected_input;
+
+	for (i = 0;; i++) {
+		CLEAR(input);
+		input.index = i;
+		if (-1 == xioctl(v4l_fd, VIDIOC_ENUMINPUT, &input)) {
+			break;
+		} else {
+			fprintf(stdout, "Video input %d is (\'%s\') \n",
+				input.index,
+				input.name
+			);
+		}
+	}
+	if (video_input) {
+		/* OK, I agree, it's not really a dynamic selection ;-) */
+		selected_input = video_input;
+		fprintf(stdout, "Forcing video input to %d\n", selected_input);
+		if (ioctl(v4l_fd, VIDIOC_S_INPUT, &selected_input) < 0) {
+			fprintf(stderr, "Failed to set video input !\n");
+		}
+	} else {
+		fprintf(stdout, "if you want to choose video input (if many), use -i option.\n");
+	}
 }
 
 static void init_capture_device(unsigned int capt_width, unsigned int capt_height)
@@ -953,7 +1024,7 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
         struct v4l2_format fmt;
 	unsigned int min;
 
-        if (-1 == xioctl(fd, VIDIOC_QUERYCAP, &cap)) {
+        if (-1 == xioctl(v4l_fd, VIDIOC_QUERYCAP, &cap)) {
                 if (EINVAL == errno) {
                         fprintf(stderr, "%s is no V4L2 device\n",
                                  dev_name);
@@ -993,15 +1064,16 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
 
         /* Select video input, video standard and tune here. */
 
+	select_video_input();
 
 	CLEAR(cropcap);
         cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-        if (0 == xioctl (fd, VIDIOC_CROPCAP, &cropcap)) {
+        if (0 == xioctl (v4l_fd, VIDIOC_CROPCAP, &cropcap)) {
                 crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 crop.c = cropcap.defrect; /* reset to default */
 
-                if (-1 == xioctl(fd, VIDIOC_S_CROP, &crop)) {
+                if (-1 == xioctl(v4l_fd, VIDIOC_S_CROP, &crop)) {
                         switch (errno) {
                         case EINVAL:
                                 /* Cropping not supported. */
@@ -1033,7 +1105,7 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
         fmt.fmt.pix.height      = capt_height;
         fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
 
-        if (-1 == xioctl(fd, VIDIOC_S_FMT, &fmt))
+        if (-1 == xioctl(v4l_fd, VIDIOC_S_FMT, &fmt))
                 errno_exit("VIDIOC_S_FMT");
 
         /* Note VIDIOC_S_FMT may change width and height. */
@@ -1073,10 +1145,10 @@ static void init_capture_device(unsigned int capt_width, unsigned int capt_heigh
 
 static void close_device(void)
 {
-        if (-1 == close (fd))
+        if (-1 == close(v4l_fd))
 	        errno_exit("close");
 
-        fd = -1;
+        v4l_fd = -1;
 }
 
 static void open_capture_device(void)
@@ -1094,9 +1166,9 @@ static void open_capture_device(void)
                 exit(EXIT_FAILURE);
         }
 
-        fd = open(dev_name, O_RDWR /* required */ | O_NONBLOCK, 0);
+        v4l_fd = open(dev_name, O_RDWR /* required */ | O_NONBLOCK, 0);
 
-        if (-1 == fd) {
+        if (-1 == v4l_fd) {
                 fprintf(stderr, "Cannot open '%s': %d, %s\n",
                          dev_name, errno, strerror (errno));
                 exit(EXIT_FAILURE);
@@ -1108,28 +1180,32 @@ static void usage(FILE *fp, int argc, char **argv)
 	fprintf (fp,
 		"Usage: %s [options]\n\n"
 		"Options:\n"
-		"  -d | --device name   Video device name [/dev/video0]\n"
-		"  -h | --help          Print this message\n"
-		"  -m | --mmap          Use memory mapped buffers\n"
-		"  -r | --read          Use read() calls\n"
-		"  -u | --userp         Use application allocated buffers\n"
-		"  --width W            Use W as screen width (instead of %d)\n"
-		"  --height H           Use H as screen height (instead of %d)\n"
-		"  --cam_width W        Use W as camera picture width (instead of %d)\n"
-		"  --cam_height H       Use H as camera picture height (instead of %d)\n"
-		"  --use_vpu IP         Uses processor VPU to encode video (at camera size) and send it to IP addr\n"
-		"  -f | --force         Forces YUV420/YU12 format on camera\n"
-		"  -b | --verbose       Display some debug informations\n"
+		"  -d | --device name     Video device name [/dev/video0]\n"
+		"  -h | --help            Print this message\n"
+		"  -i | --input           Use given video input (if many, 0 by default)\n"
+		"  -o | --capture_mode I  Use given capture mode [0-8] of sensor (if supported)\n"
+		"  -m | --mmap            Use memory mapped buffers\n"
+		"  -r | --read            Use read() calls\n"
+		"  -u | --userp           Use application allocated buffers\n"
+		"  --width W              Use W as screen width (instead of %d)\n"
+		"  --height H             Use H as screen height (instead of %d)\n"
+		"  --cam_width W          Use W as camera picture width (instead of %d)\n"
+		"  --cam_height H         Use H as camera picture height (instead of %d)\n"
+		"  --use_vpu IP           Uses processor VPU to encode video (at camera size) and send it to IP addr\n"
+		"  -f | --force           Forces YUV420/YU12 format on camera\n"
+		"  -b | --verbose         Display some debug informations\n"
 		"",
 		argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
 }
 
-static const char short_options [] = "d:hmruwtfb";
+static const char short_options [] = "d:hi:mo:ruwtfb";
 
 static const struct option long_options [] = {
 	{ "device",	required_argument,	NULL,	'd' },
 	{ "help",	no_argument,		NULL,	'h' },
+	{ "input",	required_argument,	NULL,	'i' },
 	{ "mmap",	no_argument,		NULL,	'm' },
+	{ "capture_mode",required_argument,	NULL,	'o' },
 	{ "read",	no_argument,		NULL,	'r' },
 	{ "userp",	no_argument,		NULL,	'u' },
 	{ "width",	required_argument,	NULL,	'w' },
@@ -1206,10 +1282,18 @@ int main(int argc, char **argv)
                         usage(stdout, argc, argv);
                         exit(EXIT_SUCCESS);
 
+                case 'i':
+			video_input = atoi(optarg);
+                        break;
+
                 case 'm':
                         io = IO_METHOD_MMAP;
 			break;
 
+                case 'o':
+			capture_mode = atoi(optarg);
+                        break;
+
                 case 'r':
                         io = IO_METHOD_READ;
 			break;
diff --git a/target/packages/ov5640ctrl/Makefile b/target/packages/ov5640ctrl/Makefile
new file mode 100644
index 000000000..6aced9770
--- /dev/null
+++ b/target/packages/ov5640ctrl/Makefile
@@ -0,0 +1,27 @@
+#
+# Makefile for the Armadeus OV5640 test tool
+#
+
+PWD := $(shell pwd)
+CC = $(PWD)/../../../buildroot/output/host/usr/bin/arm-linux-gcc
+
+CFLAGS = -Wall -O 
+SOURCES = $(wildcard *.c)
+OBJECTS = $(SOURCES:.c=.o)
+EXE = ov5640ctrl
+
+all: $(EXE) 
+
+%.o: %.c
+	@echo "    CC " $@
+	@$(CC) -c $(CFLAGS) $^
+
+$(EXE): $(OBJECTS)
+	@echo "    LD " $@
+	@$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+clean:
+	-rm -f $(EXE) 
+	-rm -f *.o
+
+.PHONY: clean
diff --git a/target/packages/ov5640ctrl/ov5640.c b/target/packages/ov5640ctrl/ov5640.c
new file mode 100644
index 000000000..b2799b5fb
--- /dev/null
+++ b/target/packages/ov5640ctrl/ov5640.c
@@ -0,0 +1,290 @@
+/*
+** 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
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+** 
+** This program 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 program; if not, write to the Free Software 
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+**
+*/ 
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <linux/i2c.h> 
+#include <linux/i2c-dev.h> 
+#include <sys/ioctl.h>
+
+#define DEBUG_OV5640	1
+
+#define VERSION "0.1"
+#define CONF_FILE "ov5640.conf"
+#define MAX_DUMP_LINE 100
+
+#define OV5640_I2C_SLAVE_ADDR	0x3c
+
+#define CHIP_REVISION	0x302a
+
+void usage(char *name)
+{
+	printf("\n%s utility, version %s \n", name, VERSION);
+	printf("q: quit\n");
+	printf("r: read a register\n");
+	printf("w: write to a register\n");
+	printf("u: move ROI up\n");
+	printf("h: move ROI left (from sensor PoW)\n");
+	printf("j: move ROI right (from sensor PoW)\n");
+	printf("n: move ROI down\n");
+	printf("d: dump some OV5640 registers\n");
+	printf("s: save\n");
+	printf("l: load\n");
+	printf("other: this menu\n");
+}
+
+int read_reg(int i2c_fd, unsigned int reg, unsigned char *rbuf)
+{
+	unsigned char buf[2];
+	int ret;
+
+	buf[0] = reg >> 8;
+	buf[1] = reg & 0xff;
+
+	ret = write(i2c_fd, buf, 2);
+        if (ret < 0) {
+                perror("read_reg, setting reg addr");
+		return ret;
+        }
+	read(i2c_fd, rbuf, 1);
+
+	fprintf(stdout, "read 0x%02x @ 0x%02x%02x\n", rbuf[0], buf[0], buf[1]);
+
+	return 0;
+}
+
+int write_reg(int i2c_fd, unsigned int reg, unsigned char value)
+{
+	int ret = 0;
+	int len = 3;
+
+	unsigned char buf[3];
+
+	buf[0] = reg >> 8;
+	buf[1] = reg & 0xff;
+	buf[2] = value;
+
+	fprintf(stdout, "writing 0x%02x @ 0x%02x%02x\n", value, buf[0], buf[1]);
+
+	ret = write(i2c_fd, buf, len);
+        if (ret < 0) {
+                fprintf(stderr, "Error: Write failed\n");
+		return ret;
+        }
+
+	return ret;
+}
+
+void dump(int fd, FILE* destFile)
+{
+	int i;
+	unsigned char buf[2];
+
+	for (i = 0; i < 16; i++) {
+		read_reg(fd, 0x3800 + i, buf);
+	}
+}
+
+void move_roi(int fd, int x_off, int y_off)
+{
+	static unsigned int x_addr_st = 0x150;
+	static unsigned int x_add_end = 0x8ef;
+	static unsigned int y_addr_st = 0x1b2;
+	static unsigned int y_add_end = 0x5f1;
+
+	if (!x_off)
+		goto process_y_off;
+
+	if (x_addr_st >= abs(x_off)) {
+		x_addr_st += x_off;
+		x_add_end += x_off;
+	} else {
+		fprintf(stdout, "you reached limit of Xoff\n");
+		goto no_write_reg;
+	}
+
+	write_reg(fd, 0x3800, x_addr_st >> 8);
+	write_reg(fd, 0x3801, x_addr_st & 0xff);
+	write_reg(fd, 0x3804, x_add_end >> 8);
+	write_reg(fd, 0x3805, x_add_end & 0xff);
+
+process_y_off:
+
+	if (y_addr_st >= abs(y_off)) {
+		y_addr_st += y_off;
+		y_add_end += y_off;
+	} else {
+		fprintf(stdout, "you reached limit of Yoff\n");
+		goto no_write_reg;
+	}
+
+	write_reg(fd, 0x3802, y_addr_st >> 8);
+	write_reg(fd, 0x3803, y_addr_st & 0xff);
+	write_reg(fd, 0x3806, y_add_end >> 8);
+	write_reg(fd, 0x3807, y_add_end & 0xff);
+
+no_write_reg:
+	return;
+}
+
+void write_regs_from_file(int fd, char* fileName)
+{
+	char line[MAX_DUMP_LINE];
+	char tempFileName[MAX_DUMP_LINE];
+	FILE *fd_conf = NULL;
+	int addr, val, nb = 0;
+
+	if (strlen(fileName) == 0) {
+		printf("Enter file name: ");
+		fgets(tempFileName, sizeof(tempFileName), stdin);
+		tempFileName[strlen(tempFileName)-1] = '\0'; /* suppress \n */
+	} else {
+		strcpy(tempFileName, fileName);
+	}
+ 
+	if ((fd_conf = fopen(tempFileName, "r")) == NULL) {
+		perror("can't open conf file");
+		return;
+	}
+
+	while (fgets(line, MAX_DUMP_LINE, fd_conf) != NULL) {
+		nb = sscanf(line, "%4X%*c%2X", &addr, &val);
+
+		fprintf(stdout, "--- %04x %02x (%d)\n", addr, val, nb);
+	}
+
+	if (fd_conf != NULL)
+		fclose(fd_conf);
+}
+
+/* taken from i2c-tools : */
+int set_slave_addr(int file, int address, int force)
+{
+	/* With forcei=1, let the user read from/write to the registers
+	  even when a driver is also running */
+	if (ioctl(file, force ? I2C_SLAVE_FORCE : I2C_SLAVE, address) < 0) {
+		fprintf(stderr,
+			"Error: Could not set address to 0x%02x: %s\n",
+			address, strerror(errno));
+		return -errno;
+	}
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	int i2c_fd;
+	FILE *fd_conf = NULL;
+	char string[10];
+	int regAddr;
+	int regValue;
+	char* bus = "/dev/i2c-0";
+	unsigned char read_buf[2];
+
+	if (argc > 2) { /* too many args */
+		usage(argv[0]);
+		exit(1);
+	} else if (argc == 2) { /* i2c bus */
+		bus = argv[1];
+	}
+
+	if ((i2c_fd = open(bus, O_RDWR)) < 0) {
+		perror("Open error: ");
+		exit (1);
+	}
+
+	set_slave_addr(i2c_fd, OV5640_I2C_SLAVE_ADDR, 1);
+
+	/* check OV5640 presence */
+	if (!read_reg(i2c_fd, CHIP_REVISION, read_buf)) {
+		if (read_buf[0] != 0xb0 ) {
+			printf("OV5640 revision (0x%02x) not supported... Exiting\n", read_buf[0]);
+			exit(1);
+		}
+	} else {
+		printf("OV5640 not found @ 0x%02X... Exiting\n", OV5640_I2C_SLAVE_ADDR);
+		exit(1);
+	}
+   
+	usage(argv[0]);
+	while(1) {
+		fprintf(stdout, " > ");
+
+		fgets(string, sizeof(string), stdin);
+
+		if (string[0] == 'q') {
+			exit(0);
+		}
+		else if (string[0] == 'w') {
+			printf("register address (hex without 0x): ");
+			fgets(string, sizeof(string), stdin);
+			sscanf(string, "%4x", &regAddr);
+			printf("register value (hex without 0x): ");
+			fgets(string, sizeof(string), stdin);
+			sscanf(string, "%2x", &regValue);
+			write_reg(i2c_fd, regAddr, regValue);
+		}
+		else if (string[0] == 'r') {
+			printf("register address (hex without 0x): ");
+			fgets(string, sizeof(string), stdin);
+			sscanf(string, "%4x", &regAddr);
+			read_reg(i2c_fd, regAddr, read_buf);
+		}
+		else if (string[0] == 'd') {
+			dump(i2c_fd, fd_conf);
+		}
+		else if (string[0] == 'u') {
+			move_roi(i2c_fd, 0, -30);
+		}
+		else if (string[0] == 'j') {
+			move_roi(i2c_fd, -30, 0);
+		}
+		else if (string[0] == 'h') {
+			move_roi(i2c_fd, 30, 0);
+		}
+		else if (string[0] == 'n') {
+			move_roi(i2c_fd, 0, 30);
+		}
+		else if (string[0] == 's') {
+			if ((fd_conf = fopen(CONF_FILE, "w")) < 0) {
+				perror("Open error: ");
+				exit (1);
+			}
+			/*dump(fd, fd_conf);*/
+			if (fd_conf != NULL) {
+				fclose(fd_conf);
+			}
+		}
+		else if (string[0] == 'l') {
+			write_regs_from_file(i2c_fd, "");
+		} else {
+			usage(argv[0]);
+		}
+	};
+    
+	if (i2c_fd >= 0) {
+		close(i2c_fd);
+	}
+  
+	exit (0);
+}


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-423-g8a52d62f1

From: SÃ©bastien S. <ss...@us...> - 2018-06-21 13:07: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  8a52d62f1ce933abc0065aa17ac07cf5fda36917 (commit)
      from  13bc33e185ea13b0b817c4a03041d46e39aa088a (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 8a52d62f1ce933abc0065aa17ac07cf5fda36917
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Thu Jun 21 14:42:39 2018 +0200

    [BSP] add opos6ullegacy-4.9_defconfig

-----------------------------------------------------------------------

Summary of changes:
 ...y-4.1_defconfig => opos6ullegacy-4.9_defconfig} |  24 ++-
 ...15-armadeus-logo-add_armadeus-project_tux.patch |   0
 ...50-armadeus-add_custom_drivers_to_kconfig.patch |   0
 ..._star_completion_for_source_in_menuconfig.patch |   0
 ...-add-apf6q-and-apf6dl-device-trees.patch.tofix} |   0
 ...0452-Input-sx8654-support-inverted-y-prop.patch |   0
 ...500-mxc_ipuv3_fb-unblank-displays-at-init.patch |   0
 ..._fb-move-fb_blank-call-after-registration.patch |   0
 ...able-overflow-interrupt-after-initializat.patch |   0
 .../0503-Add-support-for-DVI-monitors.patch        |   0
 ...and-simple-assumptions-in-imx6sll-support.patch |   0
 ...ernel-config-fragment-to-imx-v7-defconfig.patch |   0
 ...s-remove-spidev-oops-warning-at-load-time.patch |   8 +-
 .../0515-armadeus-imx6ull-include-input-h.patch    |  12 ++
 ...516-armadeus-imx6ull-rename-flexcan-nodes.patch |  33 +++
 ...ia-ov7670-call-v4l2_async_register_subdev.patch |  50 +++++
 .../0518-media-ov7670-fix-g-s_parm.patch           |  41 ++++
 .../0519-media-ov7670-get-xclk.patch               |  80 ++++++++
 .../0520-media-ov7670-add-devicetree-support.patch | 108 ++++++++++
 ...1-media-ov7670-Return-the-real-error-code.patch |  31 +++
 ...0-Check-the-return-value-from-clk_prepare.patch |  34 ++++
 ...dia-ov7670-Add-entity-pads-initialization.patch |  70 +++++++
 ...524-media-ov7670-Add-the-get_fmt-callback.patch | 170 ++++++++++++++++
 ...ia-ov7670-Add-the-ov7670_s_power-function.patch |  95 +++++++++
 ...a-ov7670-use-v4l2_async_unregister_subdev.patch |  34 ++++
 ...-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch | 111 ++++++++++
 ...-media-replace-all-spaces-tab-occurrences.patch |  96 +++++++++
 ...y-Add-a-nop-variant-of-media_entity_clean.patch |  63 ++++++
 ...rt-g-s_parm-to-g-s_frame_interval-in-subd.patch |  72 +++++++
 .../0700-armadeus-pcie_clk_defined_in_uboot.patch  |  10 +-
 ...pos6ul-and-opos6uldev-add-initial-support.patch | 224 ++++++++++++++++++---
 ...s-dts-fixes-imx6ul-pwm-clocks-declaration.patch |  30 +++
 ...xsfb-fixes-multi-display-timings-handling.patch |   0
 ...mx6s_caputre-add-subdev-complete-callback.patch |  29 +++
 ...rmadeus-media-mx6s_capture-define-tvnorms.patch |  21 ++
 35 files changed, 1404 insertions(+), 42 deletions(-)
 copy buildroot/configs/{opos6ullegacy-4.1_defconfig => opos6ullegacy-4.9_defconfig} (92%)
 copy patches/linux/{3.14.mx6_legacy => 4.9.mx6_legacy}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
 copy patches/linux/{3.14.mx6_legacy => 4.9.mx6_legacy}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
 copy patches/linux/{3.14.mx6_legacy => 4.9.mx6_legacy}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
 copy patches/linux/{4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch => 4.9.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix} (100%)
 copy patches/linux/{3.14.mx6_legacy => 4.9.mx6_legacy}/0452-Input-sx8654-support-inverted-y-prop.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0503-Add-support-for-DVI-monitors.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch (100%)
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0513-armadeus-add-apf6-kernel-config-fragment-to-imx-v7-defconfig.patch (100%)
 copy patches/linux/{4.8 => 4.9.mx6_legacy}/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch (69%)
 create mode 100644 patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0517-media-ov7670-call-v4l2_async_register_subdev.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0518-media-ov7670-fix-g-s_parm.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0519-media-ov7670-get-xclk.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0520-media-ov7670-add-devicetree-support.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0521-media-ov7670-Return-the-real-error-code.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0522-media-ov7670-Check-the-return-value-from-clk_prepare.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0700-armadeus-pcie_clk_defined_in_uboot.patch (72%)
 copy patches/linux/{4.9 => 4.9.mx6_legacy}/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch (70%)
 create mode 100644 patches/linux/4.9.mx6_legacy/0805-armadeus-dts-fixes-imx6ul-pwm-clocks-declaration.patch
 copy patches/linux/{4.1.mx6_legacy => 4.9.mx6_legacy}/0806-armadeus-mxsfb-fixes-multi-display-timings-handling.patch (100%)
 create mode 100644 patches/linux/4.9.mx6_legacy/0807-armadeus-media-mx6s_caputre-add-subdev-complete-callback.patch
 create mode 100644 patches/linux/4.9.mx6_legacy/0808-armadeus-media-mx6s_capture-define-tvnorms.patch

diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
similarity index 92%
copy from buildroot/configs/opos6ullegacy-4.1_defconfig
copy to buildroot/configs/opos6ullegacy-4.9_defconfig
index d05518d8f..6055ce973 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -5,9 +5,8 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-# Needed to have FSL 4.1 custom kernel includes:
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
@@ -29,13 +28,17 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.1.15_2.0.0_ga"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/4.1.mx6_legacy"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.9.11_1.0.0_ga"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9.mx6_legacy"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6ulldev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
+BR2_PACKAGE_LINUX_TOOLS_IIO=y
+BR2_PACKAGE_LINUX_TOOLS_TMON=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_DEMOS=y
@@ -73,7 +76,6 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
@@ -81,6 +83,10 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
 BR2_PACKAGE_GST1_PLUGINS_UGLY=y
 BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
+BR2_PACKAGE_GST1_IMX=y
+BR2_PACKAGE_GST1_IMX_PXP=y
+BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC=y
+BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK=y
 BR2_PACKAGE_GST1_LIBAV=y
 BR2_PACKAGE_V4L2LOOPBACK=y
 BR2_PACKAGE_GDB=y
@@ -91,7 +97,6 @@ BR2_PACKAGE_RT_TESTS=y
 BR2_PACKAGE_SPIDEV_TEST=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
-BR2_PACKAGE_HWDATA=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -106,10 +111,10 @@ BR2_PACKAGE_FBV=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
 BR2_PACKAGE_APF_CONFIG=y
-BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_EVTEST=y
 BR2_PACKAGE_FREESCALE_IMX=y
 BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y
+BR2_PACKAGE_HWDATA=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IMX_TEST=y
 BR2_PACKAGE_KBD=y
@@ -128,7 +133,7 @@ BR2_PACKAGE_HAVEGED=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
+BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_DNSMASQ=y
@@ -156,6 +161,7 @@ BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
+BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
diff --git a/patches/linux/3.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/4.9.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/4.9.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.9.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/4.9.mx6_legacy/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.14.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/4.9.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/4.9.mx6_legacy/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.9.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/4.9.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch.tofix
diff --git a/patches/linux/3.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch b/patches/linux/4.9.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
similarity index 100%
copy from patches/linux/3.14.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
copy to patches/linux/4.9.mx6_legacy/0452-Input-sx8654-support-inverted-y-prop.patch
diff --git a/patches/linux/4.1.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch b/patches/linux/4.9.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
copy to patches/linux/4.9.mx6_legacy/0500-mxc_ipuv3_fb-unblank-displays-at-init.patch
diff --git a/patches/linux/4.1.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch b/patches/linux/4.9.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
copy to patches/linux/4.9.mx6_legacy/0501-mxc_ipuv3_fb-move-fb_blank-call-after-registration.patch
diff --git a/patches/linux/4.1.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch b/patches/linux/4.9.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
copy to patches/linux/4.9.mx6_legacy/0502-mxc_hdmi-enable-overflow-interrupt-after-initializat.patch
diff --git a/patches/linux/4.1.mx6_legacy/0503-Add-support-for-DVI-monitors.patch b/patches/linux/4.9.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
copy to patches/linux/4.9.mx6_legacy/0503-Add-support-for-DVI-monitors.patch
diff --git a/patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch b/patches/linux/4.9.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch
copy to patches/linux/4.9.mx6_legacy/0504-linux-fslc-imx-4.1-2.0.x-imx-imx-fix-typo-and-simple-assumptions-in-imx6sll-support.patch
diff --git a/patches/linux/4.1.mx6_legacy/0513-armadeus-add-apf6-kernel-config-fragment-to-imx-v7-defconfig.patch b/patches/linux/4.9.mx6_legacy/0513-armadeus-add-apf6-kernel-config-fragment-to-imx-v7-defconfig.patch
similarity index 100%
copy from patches/linux/4.1.mx6_legacy/0513-armadeus-add-apf6-kernel-config-fragment-to-imx-v7-defconfig.patch
copy to patches/linux/4.9.mx6_legacy/0513-armadeus-add-apf6-kernel-config-fragment-to-imx-v7-defconfig.patch
diff --git a/patches/linux/4.8/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch b/patches/linux/4.9.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
similarity index 69%
copy from patches/linux/4.8/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
copy to patches/linux/4.9.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
index 2cad3fd2d..ec8158fa6 100644
--- a/patches/linux/4.8/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
+++ b/patches/linux/4.9.mx6_legacy/0514-armadeus-remove-spidev-oops-warning-at-load-time.patch
@@ -3,14 +3,14 @@ kernels with device tree support.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux/drivers/spi/spidev.c
+Index: linux-imx_4.9.11_1.0.0_ga/drivers/spi/spidev.c
 ===================================================================
---- linux.orig/drivers/spi/spidev.c
-+++ linux/drivers/spi/spidev.c
+--- linux-imx_4.9.11_1.0.0_ga.orig/drivers/spi/spidev.c
++++ linux-imx_4.9.11_1.0.0_ga/drivers/spi/spidev.c
 @@ -696,6 +696,7 @@ static struct class *spidev_class;
  static const struct of_device_id spidev_dt_ids[] = {
  	{ .compatible = "rohm,dh2228fv" },
-	{ .compatible = "lineartechnology,ltc2488" },
+ 	{ .compatible = "lineartechnology,ltc2488" },
 +	{ .compatible = "spidev" },
  	{},
  };
diff --git a/patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch b/patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
new file mode 100644
index 000000000..71c0a78cb
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0515-armadeus-imx6ull-include-input-h.patch
@@ -0,0 +1,12 @@
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull.dtsi
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+@@ -9,6 +9,7 @@
+ 
+ #include <dt-bindings/clock/imx6ul-clock.h>
+ #include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include "imx6ull-pinfunc.h"
+ #include "imx6ull-pinfunc-snvs.h"
diff --git a/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch b/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
new file mode 100644
index 000000000..6b455ca30
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0516-armadeus-imx6ull-rename-flexcan-nodes.patch
@@ -0,0 +1,33 @@
+Index: linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+===================================================================
+--- linux-imx_4.9.11_1.0.0_ga.orig/arch/arm/boot/dts/imx6ull.dtsi
++++ linux-imx_4.9.11_1.0.0_ga/arch/arm/boot/dts/imx6ull.dtsi
+@@ -17,8 +17,8 @@
+ 
+ / {
+ 	aliases {
+-		can0 = &flexcan1;
+-		can1 = &flexcan2;
++		can0 = &can1;
++		can1 = &can2;
+ 		ethernet0 = &fec1;
+ 		ethernet1 = &fec2;
+ 		gpio0 = &gpio1;
+@@ -473,7 +473,7 @@
+ 				#pwm-cells = <2>;
+ 			};
+ 
+-			flexcan1: can@02090000 {
++			can1: can@02090000 {
+ 				compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
+ 				reg = <0x02090000 0x4000>;
+ 				interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+@@ -484,7 +484,7 @@
+ 				status = "disabled";
+ 			};
+ 
+-			flexcan2: can@02094000 {
++			can2: can@02094000 {
+ 				compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan";
+ 				reg = <0x02094000 0x4000>;
+ 				interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/patches/linux/4.9.mx6_legacy/0517-media-ov7670-call-v4l2_async_register_subdev.patch b/patches/linux/4.9.mx6_legacy/0517-media-ov7670-call-v4l2_async_register_subdev.patch
new file mode 100644
index 000000000..6414cdfdc
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0517-media-ov7670-call-v4l2_async_register_subdev.patch
@@ -0,0 +1,50 @@
+From 7d1b8619eaefc7a1288273964a04cf640f3af33f Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <han...@ci...>
+Date: Tue, 16 Aug 2016 15:55:58 -0300
+Subject: [PATCH 517/531] [media] ov7670: call v4l2_async_register_subdev
+
+Add v4l2-async support for this driver.
+
+Signed-off-by: Hans Verkuil <han...@ci...>
+Acked-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 56cfb5ca9c95..9af8d3b8f848 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1636,10 +1636,9 @@ static int ov7670_probe(struct i2c_client *client,
+ 			V4L2_EXPOSURE_AUTO);
+ 	sd->ctrl_handler = &info->hdl;
+ 	if (info->hdl.error) {
+-		int err = info->hdl.error;
++		ret = info->hdl.error;
+ 
+-		v4l2_ctrl_handler_free(&info->hdl);
+-		return err;
++		goto hdl_free;
+ 	}
+ 	/*
+ 	 * We have checked empirically that hw allows to read back the gain
+@@ -1651,7 +1650,15 @@ static int ov7670_probe(struct i2c_client *client,
+ 	v4l2_ctrl_cluster(2, &info->saturation);
+ 	v4l2_ctrl_handler_setup(&info->hdl);
+ 
++	ret = v4l2_async_register_subdev(&info->sd);
++	if (ret < 0)
++		goto hdl_free;
++
+ 	return 0;
++
++hdl_free:
++	v4l2_ctrl_handler_free(&info->hdl);
++	return ret;
+ }
+ 
+ 
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0518-media-ov7670-fix-g-s_parm.patch b/patches/linux/4.9.mx6_legacy/0518-media-ov7670-fix-g-s_parm.patch
new file mode 100644
index 000000000..ceca23352
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0518-media-ov7670-fix-g-s_parm.patch
@@ -0,0 +1,41 @@
+From d569e90bb74c7f69dc56a808effc49c1da055427 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <han...@ci...>
+Date: Tue, 16 Aug 2016 15:57:46 -0300
+Subject: [PATCH 518/531] [media] ov7670: fix g/s_parm
+
+Drop unnecesary memset. Drop the unnecessary extendedmode check and
+set the V4L2_CAP_TIMEPERFRAME capability.
+
+Signed-off-by: Hans Verkuil <han...@ci...>
+Acked-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 9af8d3b8f848..50e4466a2b37 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1046,7 +1046,6 @@ static int ov7670_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
+ 	if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ 		return -EINVAL;
+ 
+-	memset(cp, 0, sizeof(struct v4l2_captureparm));
+ 	cp->capability = V4L2_CAP_TIMEPERFRAME;
+ 	info->devtype->get_framerate(sd, &cp->timeperframe);
+ 
+@@ -1061,9 +1060,8 @@ static int ov7670_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
+ 
+ 	if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ 		return -EINVAL;
+-	if (cp->extendedmode != 0)
+-		return -EINVAL;
+ 
++	cp->capability = V4L2_CAP_TIMEPERFRAME;
+ 	return info->devtype->set_framerate(sd, tpf);
+ }
+ 
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0519-media-ov7670-get-xclk.patch b/patches/linux/4.9.mx6_legacy/0519-media-ov7670-get-xclk.patch
new file mode 100644
index 000000000..e27a9fa80
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0519-media-ov7670-get-xclk.patch
@@ -0,0 +1,80 @@
+From 0a024d634cee94e9f3e3d16d90b049522845c238 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <han...@ci...>
+Date: Tue, 16 Aug 2016 16:00:57 -0300
+Subject: [PATCH 519/531] [media] ov7670: get xclk
+
+Get the clock for this sensor.
+
+Signed-off-by: Hans Verkuil <han...@ci...>
+Acked-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 50e4466a2b37..912ff09c6100 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -10,6 +10,7 @@
+  * This file may be distributed under the terms of the GNU General
+  * Public License, version 2.
+  */
++#include <linux/clk.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+@@ -227,6 +228,7 @@ struct ov7670_info {
+ 		struct v4l2_ctrl *hue;
+ 	};
+ 	struct ov7670_format_struct *fmt;  /* Current format */
++	struct clk *clk;
+ 	int min_width;			/* Filter out smaller sizes */
+ 	int min_height;			/* Filter out smaller sizes */
+ 	int clock_speed;		/* External clock speed (MHz) */
+@@ -1587,13 +1589,24 @@ static int ov7670_probe(struct i2c_client *client,
+ 			info->pclk_hb_disable = true;
+ 	}
+ 
++	info->clk = devm_clk_get(&client->dev, "xclk");
++	if (IS_ERR(info->clk))
++		return -EPROBE_DEFER;
++	clk_prepare_enable(info->clk);
++
++	info->clock_speed = clk_get_rate(info->clk) / 1000000;
++	if (info->clock_speed < 10 || info->clock_speed > 48) {
++		ret = -EINVAL;
++		goto clk_disable;
++	}
++
+ 	/* Make sure it's an ov7670 */
+ 	ret = ov7670_detect(sd);
+ 	if (ret) {
+ 		v4l_dbg(1, debug, client,
+ 			"chip found @ 0x%x (%s) is not an ov7670 chip.\n",
+ 			client->addr << 1, client->adapter->name);
+-		return ret;
++		goto clk_disable;
+ 	}
+ 	v4l_info(client, "chip found @ 0x%02x (%s)\n",
+ 			client->addr << 1, client->adapter->name);
+@@ -1656,6 +1669,8 @@ static int ov7670_probe(struct i2c_client *client,
+ 
+ hdl_free:
+ 	v4l2_ctrl_handler_free(&info->hdl);
++clk_disable:
++	clk_disable_unprepare(info->clk);
+ 	return ret;
+ }
+ 
+@@ -1667,6 +1682,7 @@ static int ov7670_remove(struct i2c_client *client)
+ 
+ 	v4l2_device_unregister_subdev(sd);
+ 	v4l2_ctrl_handler_free(&info->hdl);
++	clk_disable_unprepare(info->clk);
+ 	return 0;
+ }
+ 
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0520-media-ov7670-add-devicetree-support.patch b/patches/linux/4.9.mx6_legacy/0520-media-ov7670-add-devicetree-support.patch
new file mode 100644
index 000000000..3e778bebd
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0520-media-ov7670-add-devicetree-support.patch
@@ -0,0 +1,108 @@
+From a0c4164e0ec04a0a0d947285a923864b405ce96b Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <han...@ci...>
+Date: Mon, 12 Dec 2016 12:08:18 -0200
+Subject: [PATCH 520/531] [media] ov7670: add devicetree support
+
+Add DT support. Use it to get the reset and pwdn pins (if there are any).
+Tested with one sensor requiring reset/pwdn and one sensor that doesn't
+have reset/pwdn pins.
+
+Signed-off-by: Hans Verkuil <han...@ci...>
+Acked-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 40 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 38 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 912ff09c6100..7270c68ed18a 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -17,6 +17,8 @@
+ #include <linux/i2c.h>
+ #include <linux/delay.h>
+ #include <linux/videodev2.h>
++#include <linux/gpio.h>
++#include <linux/gpio/consumer.h>
+ #include <media/v4l2-device.h>
+ #include <media/v4l2-ctrls.h>
+ #include <media/v4l2-mediabus.h>
+@@ -229,6 +231,8 @@ struct ov7670_info {
+ 	};
+ 	struct ov7670_format_struct *fmt;  /* Current format */
+ 	struct clk *clk;
++	struct gpio_desc *resetb_gpio;
++	struct gpio_desc *pwdn_gpio;
+ 	int min_width;			/* Filter out smaller sizes */
+ 	int min_height;			/* Filter out smaller sizes */
+ 	int clock_speed;		/* External clock speed (MHz) */
+@@ -591,8 +595,6 @@ static int ov7670_init(struct v4l2_subdev *sd, u32 val)
+ 	return ov7670_write_array(sd, ov7670_default_regs);
+ }
+ 
+-
+-
+ static int ov7670_detect(struct v4l2_subdev *sd)
+ {
+ 	unsigned char v;
+@@ -1549,6 +1551,27 @@ static const struct ov7670_devtype ov7670_devdata[] = {
+ 	},
+ };
+ 
++static int ov7670_init_gpio(struct i2c_client *client, struct ov7670_info *info)
++{
++	info->pwdn_gpio = devm_gpiod_get_optional(&client->dev, "powerdown",
++			GPIOD_OUT_LOW);
++	if (IS_ERR(info->pwdn_gpio)) {
++		dev_info(&client->dev, "can't get %s GPIO\n", "powerdown");
++		return PTR_ERR(info->pwdn_gpio);
++	}
++
++	info->resetb_gpio = devm_gpiod_get_optional(&client->dev, "reset",
++			GPIOD_OUT_LOW);
++	if (IS_ERR(info->resetb_gpio)) {
++		dev_info(&client->dev, "can't get %s GPIO\n", "reset");
++		return PTR_ERR(info->resetb_gpio);
++	}
++
++	usleep_range(3000, 5000);
++
++	return 0;
++}
++
+ static int ov7670_probe(struct i2c_client *client,
+ 			const struct i2c_device_id *id)
+ {
+@@ -1594,6 +1617,10 @@ static int ov7670_probe(struct i2c_client *client,
+ 		return -EPROBE_DEFER;
+ 	clk_prepare_enable(info->clk);
+ 
++	ret = ov7670_init_gpio(client, info);
++	if (ret)
++		goto clk_disable;
++
+ 	info->clock_speed = clk_get_rate(info->clk) / 1000000;
+ 	if (info->clock_speed < 10 || info->clock_speed > 48) {
+ 		ret = -EINVAL;
+@@ -1693,9 +1720,18 @@ static const struct i2c_device_id ov7670_id[] = {
+ };
+ MODULE_DEVICE_TABLE(i2c, ov7670_id);
+ 
++#if IS_ENABLED(CONFIG_OF)
++static const struct of_device_id ov7670_of_match[] = {
++	{ .compatible = "ovti,ov7670", },
++	{ /* sentinel */ },
++};
++MODULE_DEVICE_TABLE(of, ov7670_of_match);
++#endif
++
+ static struct i2c_driver ov7670_driver = {
+ 	.driver = {
+ 		.name	= "ov7670",
++		.of_match_table = of_match_ptr(ov7670_of_match),
+ 	},
+ 	.probe		= ov7670_probe,
+ 	.remove		= ov7670_remove,
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0521-media-ov7670-Return-the-real-error-code.patch b/patches/linux/4.9.mx6_legacy/0521-media-ov7670-Return-the-real-error-code.patch
new file mode 100644
index 000000000..eedfafe43
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0521-media-ov7670-Return-the-real-error-code.patch
@@ -0,0 +1,31 @@
+From 011dfab80543019d01f66665734f50f5a4b26e6d Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fab...@nx...>
+Date: Tue, 18 Jul 2017 23:34:18 -0400
+Subject: [PATCH 521/531] media: ov7670: Return the real error code
+
+When devm_clk_get() fails the real error code should be propagated,
+instead of always returning -EPROBE_DEFER.
+
+Signed-off-by: Fabio Estevam <fab...@nx...>
+Signed-off-by: Hans Verkuil <han...@ci...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 7270c68ed18a..552a881e24da 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1614,7 +1614,7 @@ static int ov7670_probe(struct i2c_client *client,
+ 
+ 	info->clk = devm_clk_get(&client->dev, "xclk");
+ 	if (IS_ERR(info->clk))
+-		return -EPROBE_DEFER;
++		return PTR_ERR(info->clk);
+ 	clk_prepare_enable(info->clk);
+ 
+ 	ret = ov7670_init_gpio(client, info);
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0522-media-ov7670-Check-the-return-value-from-clk_prepare.patch b/patches/linux/4.9.mx6_legacy/0522-media-ov7670-Check-the-return-value-from-clk_prepare.patch
new file mode 100644
index 000000000..117f2be53
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0522-media-ov7670-Check-the-return-value-from-clk_prepare.patch
@@ -0,0 +1,34 @@
+From 1fc86ad052fc051639df1f60faeb619dbe567e07 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fab...@nx...>
+Date: Tue, 18 Jul 2017 23:34:19 -0400
+Subject: [PATCH 522/531] media: ov7670: Check the return value from
+ clk_prepare_enable()
+
+clk_prepare_enable() may fail, so we should better check its return value
+and propagate it in the case of error.
+
+Signed-off-by: Fabio Estevam <fab...@nx...>
+Signed-off-by: Hans Verkuil <han...@ci...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 552a881e24da..e88549f0e704 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1615,7 +1615,9 @@ static int ov7670_probe(struct i2c_client *client,
+ 	info->clk = devm_clk_get(&client->dev, "xclk");
+ 	if (IS_ERR(info->clk))
+ 		return PTR_ERR(info->clk);
+-	clk_prepare_enable(info->clk);
++	ret = clk_prepare_enable(info->clk);
++	if (ret)
++		return ret;
+ 
+ 	ret = ov7670_init_gpio(client, info);
+ 	if (ret)
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch b/patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
new file mode 100644
index 000000000..abb047a36
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0523-media-ov7670-Add-entity-pads-initialization.patch
@@ -0,0 +1,70 @@
+From d94a26f05b017d93513d176959c49996768f446f Mon Sep 17 00:00:00 2001
+From: Wenyou Yang <wen...@mi...>
+Date: Mon, 16 Oct 2017 05:14:25 +0200
+Subject: [PATCH 523/531] media: ov7670: Add entity pads initialization
+
+Add the media entity pads initialization.
+
+Signed-off-by: Wenyou Yang <wen...@mi...>
+Signed-off-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@os...>
+---
+ drivers/media/i2c/ov7670.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index e88549f0e704..553945d4ca28 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -213,6 +213,9 @@ struct ov7670_devtype {
+ struct ov7670_format_struct;  /* coming later */
+ struct ov7670_info {
+ 	struct v4l2_subdev sd;
++#if defined(CONFIG_MEDIA_CONTROLLER)
++	struct media_pad pad;
++#endif
+ 	struct v4l2_ctrl_handler hdl;
+ 	struct {
+ 		/* gain cluster */
+@@ -1688,14 +1691,27 @@ static int ov7670_probe(struct i2c_client *client,
+ 	v4l2_ctrl_auto_cluster(2, &info->auto_exposure,
+ 			       V4L2_EXPOSURE_MANUAL, false);
+ 	v4l2_ctrl_cluster(2, &info->saturation);
++
++#if defined(CONFIG_MEDIA_CONTROLLER)
++	info->pad.flags = MEDIA_PAD_FL_SOURCE;
++	info->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
++	ret = media_entity_pads_init(&info->sd.entity, 1, &info->pad);
++	if (ret < 0)
++		goto hdl_free;
++#endif
++
+ 	v4l2_ctrl_handler_setup(&info->hdl);
+ 
+ 	ret = v4l2_async_register_subdev(&info->sd);
+ 	if (ret < 0)
+-		goto hdl_free;
++		goto entity_cleanup;
+ 
+ 	return 0;
+ 
++entity_cleanup:
++#if defined(CONFIG_MEDIA_CONTROLLER)
++	media_entity_cleanup(&info->sd.entity);
++#endif
+ hdl_free:
+ 	v4l2_ctrl_handler_free(&info->hdl);
+ clk_disable:
+@@ -1712,6 +1728,9 @@ static int ov7670_remove(struct i2c_client *client)
+ 	v4l2_device_unregister_subdev(sd);
+ 	v4l2_ctrl_handler_free(&info->hdl);
+ 	clk_disable_unprepare(info->clk);
++#if defined(CONFIG_MEDIA_CONTROLLER)
++	media_entity_cleanup(&info->sd.entity);
++#endif
+ 	return 0;
+ }
+ 
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch b/patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
new file mode 100644
index 000000000..3cb8c8650
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0524-media-ov7670-Add-the-get_fmt-callback.patch
@@ -0,0 +1,170 @@
+From c0662dd4e7a407a5ac79cc6ca4d1116bf03d3731 Mon Sep 17 00:00:00 2001
+From: Wenyou Yang <wen...@mi...>
+Date: Mon, 16 Oct 2017 05:14:26 +0200
+Subject: [PATCH 524/531] media: ov7670: Add the get_fmt callback
+
+Add the get_fmt callback, also enable V4L2_SUBDEV_FL_HAS_DEVNODE flag
+to make this subdev has device node.
+
+Signed-off-by: Wenyou Yang <wen...@mi...>
+Signed-off-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@os...>
+---
+ drivers/media/i2c/ov7670.c | 77 +++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 76 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 553945d4ca28..73ceec63a8ca 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -232,6 +232,7 @@ struct ov7670_info {
+ 		struct v4l2_ctrl *saturation;
+ 		struct v4l2_ctrl *hue;
+ 	};
++	struct v4l2_mbus_framefmt format;
+ 	struct ov7670_format_struct *fmt;  /* Current format */
+ 	struct clk *clk;
+ 	struct gpio_desc *resetb_gpio;
+@@ -975,6 +976,9 @@ static int ov7670_try_fmt_internal(struct v4l2_subdev *sd,
+ 	fmt->width = wsize->width;
+ 	fmt->height = wsize->height;
+ 	fmt->colorspace = ov7670_formats[index].colorspace;
++
++	info->format = *fmt;
++
+ 	return 0;
+ }
+ 
+@@ -988,6 +992,9 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
+ 	struct ov7670_format_struct *ovfmt;
+ 	struct ov7670_win_size *wsize;
+ 	struct ov7670_info *info = to_state(sd);
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++	struct v4l2_mbus_framefmt *mbus_fmt;
++#endif
+ 	unsigned char com7;
+ 	int ret;
+ 
+@@ -998,8 +1005,13 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
+ 		ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
+ 		if (ret)
+ 			return ret;
+-		cfg->try_fmt = format->format;
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++		mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
++		*mbus_fmt = format->format;
+ 		return 0;
++#else
++		return -ENOTTY;
++#endif
+ 	}
+ 
+ 	ret = ov7670_try_fmt_internal(sd, &format->format, &ovfmt, &wsize);
+@@ -1041,6 +1053,30 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
+ 	return 0;
+ }
+ 
++static int ov7670_get_fmt(struct v4l2_subdev *sd,
++			  struct v4l2_subdev_pad_config *cfg,
++			  struct v4l2_subdev_format *format)
++{
++	struct ov7670_info *info = to_state(sd);
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++	struct v4l2_mbus_framefmt *mbus_fmt;
++#endif
++
++	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++		mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);
++		format->format = *mbus_fmt;
++		return 0;
++#else
++		return -ENOTTY;
++#endif
++	} else {
++		format->format = info->format;
++	}
++
++	return 0;
++}
++
+ /*
+  * Implement G/S_PARM.  There is a "high quality" mode we could try
+  * to do someday; for now, we just do the frame rate tweak.
+@@ -1508,6 +1544,30 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis
+ }
+ #endif
+ 
++static void ov7670_get_default_format(struct v4l2_subdev *sd,
++				      struct v4l2_mbus_framefmt *format)
++{
++	struct ov7670_info *info = to_state(sd);
++
++	format->width = info->devtype->win_sizes[0].width;
++	format->height = info->devtype->win_sizes[0].height;
++	format->colorspace = info->fmt->colorspace;
++	format->code = info->fmt->mbus_code;
++	format->field = V4L2_FIELD_NONE;
++}
++
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++static int ov7670_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct v4l2_mbus_framefmt *format =
++				v4l2_subdev_get_try_format(sd, fh->pad, 0);
++
++	ov7670_get_default_format(sd, format);
++
++	return 0;
++}
++#endif
++
+ /* ----------------------------------------------------------------------- */
+ 
+ static const struct v4l2_subdev_core_ops ov7670_core_ops = {
+@@ -1528,6 +1588,7 @@ static const struct v4l2_subdev_pad_ops ov7670_pad_ops = {
+ 	.enum_frame_interval = ov7670_enum_frame_interval,
+ 	.enum_frame_size = ov7670_enum_frame_size,
+ 	.enum_mbus_code = ov7670_enum_mbus_code,
++	.get_fmt = ov7670_get_fmt,
+ 	.set_fmt = ov7670_set_fmt,
+ };
+ 
+@@ -1537,6 +1598,12 @@ static const struct v4l2_subdev_ops ov7670_ops = {
+ 	.pad = &ov7670_pad_ops,
+ };
+ 
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++static const struct v4l2_subdev_internal_ops ov7670_subdev_internal_ops = {
++	.open = ov7670_open,
++};
++#endif
++
+ /* ----------------------------------------------------------------------- */
+ 
+ static const struct ov7670_devtype ov7670_devdata[] = {
+@@ -1589,6 +1656,11 @@ static int ov7670_probe(struct i2c_client *client,
+ 	sd = &info->sd;
+ 	v4l2_i2c_subdev_init(sd, client, &ov7670_ops);
+ 
++#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
++	sd->internal_ops = &ov7670_subdev_internal_ops;
++	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
++#endif
++
+ 	info->clock_speed = 30; /* default: a guess */
+ 	if (client->dev.platform_data) {
+ 		struct ov7670_config *config = client->dev.platform_data;
+@@ -1645,6 +1717,9 @@ static int ov7670_probe(struct i2c_client *client,
+ 
+ 	info->devtype = &ov7670_devdata[id->driver_data];
+ 	info->fmt = &ov7670_formats[0];
++
++	ov7670_get_default_format(sd, &info->format);
++
+ 	info->clkrc = 0;
+ 
+ 	/* Set default frame rate to 30 fps */
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch b/patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
new file mode 100644
index 000000000..024533bcd
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0525-media-ov7670-Add-the-ov7670_s_power-function.patch
@@ -0,0 +1,95 @@
+From 71862f63f351078560a7ce35c6c2e2ca16750374 Mon Sep 17 00:00:00 2001
+From: Wenyou Yang <wen...@mi...>
+Date: Mon, 16 Oct 2017 05:14:27 +0200
+Subject: [PATCH 525/531] media: ov7670: Add the ov7670_s_power function
+
+Add the ov7670_s_power function which is responsible for
+manipulating the power dowm mode through the PWDN pin and the reset
+operation through the RESET pin, and keep it powered at all times.
+
+[sak...@li...: set pwdn_gpio direction only once]
+Signed-off-by: Wenyou Yang <wen...@mi...>
+Signed-off-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@os...>
+---
+ drivers/media/i2c/ov7670.c | 31 ++++++++++++++++++++++++++-----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 73ceec63a8ca..950a0acf85fb 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1544,6 +1544,22 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis
+ }
+ #endif
+ 
++static int ov7670_s_power(struct v4l2_subdev *sd, int on)
++{
++	struct ov7670_info *info = to_state(sd);
++
++	if (info->pwdn_gpio)
++		gpiod_set_value(info->pwdn_gpio, !on);
++	if (on && info->resetb_gpio) {
++		gpiod_set_value(info->resetb_gpio, 1);
++		usleep_range(500, 1000);
++		gpiod_set_value(info->resetb_gpio, 0);
++		usleep_range(3000, 5000);
++	}
++
++	return 0;
++}
++
+ static void ov7670_get_default_format(struct v4l2_subdev *sd,
+ 				      struct v4l2_mbus_framefmt *format)
+ {
+@@ -1694,23 +1710,25 @@ static int ov7670_probe(struct i2c_client *client,
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = ov7670_init_gpio(client, info);
+-	if (ret)
+-		goto clk_disable;
+-
+ 	info->clock_speed = clk_get_rate(info->clk) / 1000000;
+ 	if (info->clock_speed < 10 || info->clock_speed > 48) {
+ 		ret = -EINVAL;
+ 		goto clk_disable;
+ 	}
+ 
++	ret = ov7670_init_gpio(client, info);
++	if (ret)
++		goto clk_disable;
++
++	ov7670_s_power(sd, 1);
++
+ 	/* Make sure it's an ov7670 */
+ 	ret = ov7670_detect(sd);
+ 	if (ret) {
+ 		v4l_dbg(1, debug, client,
+ 			"chip found @ 0x%x (%s) is not an ov7670 chip.\n",
+ 			client->addr << 1, client->adapter->name);
+-		goto clk_disable;
++		goto power_off;
+ 	}
+ 	v4l_info(client, "chip found @ 0x%02x (%s)\n",
+ 			client->addr << 1, client->adapter->name);
+@@ -1789,6 +1807,8 @@ static int ov7670_probe(struct i2c_client *client,
+ #endif
+ hdl_free:
+ 	v4l2_ctrl_handler_free(&info->hdl);
++power_off:
++	ov7670_s_power(sd, 0);
+ clk_disable:
+ 	clk_disable_unprepare(info->clk);
+ 	return ret;
+@@ -1806,6 +1826,7 @@ static int ov7670_remove(struct i2c_client *client)
+ #if defined(CONFIG_MEDIA_CONTROLLER)
+ 	media_entity_cleanup(&info->sd.entity);
+ #endif
++	ov7670_s_power(sd, 0);
+ 	return 0;
+ }
+ 
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch b/patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
new file mode 100644
index 000000000..0a3dfd46d
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0526-media-ov7670-use-v4l2_async_unregister_subdev.patch
@@ -0,0 +1,34 @@
+From 344aa836e813a6b097c23f2e0633dd17f62c2ed7 Mon Sep 17 00:00:00 2001
+From: Akinobu Mita <aki...@gm...>
+Date: Fri, 24 Nov 2017 09:40:44 -0500
+Subject: [PATCH 526/531] media: ov7670: use v4l2_async_unregister_subdev()
+
+The sub-device for ov7670 is registered by v4l2_async_register_subdev().
+So it should be unregistered by v4l2_async_unregister_subdev() instead of
+v4l2_device_unregister_subdev().
+
+Cc: Jonathan Corbet <co...@lw...>
+Signed-off-by: Akinobu Mita <aki...@gm...>
+Reviewed-by: Kieran Bingham <kie...@id...>
+Signed-off-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 950a0acf85fb..b61d88e7f3eb 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1820,7 +1820,7 @@ static int ov7670_remove(struct i2c_client *client)
+ 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ 	struct ov7670_info *info = to_state(sd);
+ 
+-	v4l2_device_unregister_subdev(sd);
++	v4l2_async_unregister_subdev(sd);
+ 	v4l2_ctrl_handler_free(&info->hdl);
+ 	clk_disable_unprepare(info->clk);
+ #if defined(CONFIG_MEDIA_CONTROLLER)
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch b/patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
new file mode 100644
index 000000000..204accee0
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0527-media-ov7670-add-V4L2_CID_TEST_PATTERN-control.patch
@@ -0,0 +1,111 @@
+From b48d908d2b04e5c11bf0f9035bf52f7c0c988603 Mon Sep 17 00:00:00 2001
+From: Akinobu Mita <aki...@gm...>
+Date: Fri, 24 Nov 2017 09:40:45 -0500
+Subject: [PATCH 527/531] media: ov7670: add V4L2_CID_TEST_PATTERN control
+
+The ov7670 has the test pattern generator features.  This makes use of
+it through V4L2_CID_TEST_PATTERN control.
+
+Cc: Jonathan Corbet <co...@lw...>
+Signed-off-by: Akinobu Mita <aki...@gm...>
+Signed-off-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 45 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index b61d88e7f3eb..c6c32f649777 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -163,6 +163,11 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
+ #define   DBLV_X6	  0x10	  /* clock x6 */
+ #define   DBLV_X8	  0x11	  /* clock x8 */
+ 
++#define REG_SCALING_XSC	0x70	/* Test pattern and horizontal scale factor */
++#define   TEST_PATTTERN_0 0x80
++#define REG_SCALING_YSC	0x71	/* Test pattern and vertical scale factor */
++#define   TEST_PATTTERN_1 0x80
++
+ #define REG_REG76	0x76	/* OV's name */
+ #define   R76_BLKPCOR	  0x80	  /* Black pixel correction enable */
+ #define   R76_WHTPCOR	  0x40	  /* White pixel correction enable */
+@@ -292,7 +297,8 @@ static struct regval_list ov7670_default_regs[] = {
+ 
+ 	{ REG_COM3, 0 },	{ REG_COM14, 0 },
+ 	/* Mystery scaling numbers */
+-	{ 0x70, 0x3a },		{ 0x71, 0x35 },
++	{ REG_SCALING_XSC, 0x3a },
++	{ REG_SCALING_YSC, 0x35 },
+ 	{ 0x72, 0x11 },		{ 0x73, 0xf0 },
+ 	{ 0xa2, 0x02 },		{ REG_COM10, 0x0 },
+ 
+@@ -568,6 +574,19 @@ static int ov7670_write(struct v4l2_subdev *sd, unsigned char reg,
+ 		return ov7670_write_i2c(sd, reg, value);
+ }
+ 
++static int ov7670_update_bits(struct v4l2_subdev *sd, unsigned char reg,
++		unsigned char mask, unsigned char value)
++{
++	unsigned char orig;
++	int ret;
++
++	ret = ov7670_read(sd, reg, &orig);
++	if (ret)
++		return ret;
++
++	return ov7670_write(sd, reg, (orig & ~mask) | (value & mask));
++}
++
+ /*
+  * Write a list of register settings; ff/ff stops the process.
+  */
+@@ -1470,6 +1489,25 @@ static int ov7670_s_autoexp(struct v4l2_subdev *sd,
+ 	return ret;
+ }
+ 
++static const char * const ov7670_test_pattern_menu[] = {
++	"No test output",
++	"Shifting \"1\"",
++	"8-bar color bar",
++	"Fade to gray color bar",
++};
++
++static int ov7670_s_test_pattern(struct v4l2_subdev *sd, int value)
++{
++	int ret;
++
++	ret = ov7670_update_bits(sd, REG_SCALING_XSC, TEST_PATTTERN_0,
++				value & BIT(0) ? TEST_PATTTERN_0 : 0);
++	if (ret)
++		return ret;
++
++	return ov7670_update_bits(sd, REG_SCALING_YSC, TEST_PATTTERN_1,
++				value & BIT(1) ? TEST_PATTTERN_1 : 0);
++}
+ 
+ static int ov7670_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+ {
+@@ -1516,6 +1554,8 @@ static int ov7670_s_ctrl(struct v4l2_ctrl *ctrl)
+ 			return ov7670_s_exp(sd, info->exposure->val);
+ 		}
+ 		return ov7670_s_autoexp(sd, ctrl->val);
++	case V4L2_CID_TEST_PATTERN:
++		return ov7670_s_test_pattern(sd, ctrl->val);
+ 	}
+ 	return -EINVAL;
+ }
+@@ -1770,6 +1810,10 @@ static int ov7670_probe(struct i2c_client *client,
+ 	info->auto_exposure = v4l2_ctrl_new_std_menu(&info->hdl, &ov7670_ctrl_ops,
+ 			V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL, 0,
+ 			V4L2_EXPOSURE_AUTO);
++	v4l2_ctrl_new_std_menu_items(&info->hdl, &ov7670_ctrl_ops,
++			V4L2_CID_TEST_PATTERN,
++			ARRAY_SIZE(ov7670_test_pattern_menu) - 1, 0, 0,
++			ov7670_test_pattern_menu);
+ 	sd->ctrl_handler = &info->hdl;
+ 	if (info->hdl.error) {
+ 		ret = info->hdl.error;
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch b/patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
new file mode 100644
index 000000000..6aa7fe6e6
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0528-media-replace-all-spaces-tab-occurrences.patch
@@ -0,0 +1,96 @@
+From 6e6a8b5a38cb04d5ef35d4eb57836126b954e7c8 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mc...@s-...>
+Date: Thu, 4 Jan 2018 13:08:56 -0500
+Subject: [PATCH 528/531] media: replace all <spaces><tab> occurrences
+
+There are a lot of places where sequences of space/tabs are
+found. Get rid of all spaces before tabs.
+
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index c6c32f649777..fd229bc8a0e5 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -412,12 +412,12 @@ static struct regval_list ov7670_fmt_yuv422[] = {
+ 	{ REG_COM1, 0 },	/* CCIR601 */
+ 	{ REG_COM15, COM15_R00FF },
+ 	{ REG_COM9, 0x48 }, /* 32x gain ceiling; 0x8 is reserved bit */
+-	{ 0x4f, 0x80 }, 	/* "matrix coefficient 1" */
+-	{ 0x50, 0x80 }, 	/* "matrix coefficient 2" */
++	{ 0x4f, 0x80 },		/* "matrix coefficient 1" */
++	{ 0x50, 0x80 },		/* "matrix coefficient 2" */
+ 	{ 0x51, 0    },		/* vb */
+-	{ 0x52, 0x22 }, 	/* "matrix coefficient 4" */
+-	{ 0x53, 0x5e }, 	/* "matrix coefficient 5" */
+-	{ 0x54, 0x80 }, 	/* "matrix coefficient 6" */
++	{ 0x52, 0x22 },		/* "matrix coefficient 4" */
++	{ 0x53, 0x5e },		/* "matrix coefficient 5" */
++	{ 0x54, 0x80 },		/* "matrix coefficient 6" */
+ 	{ REG_COM13, COM13_GAMMA|COM13_UVSAT },
+ 	{ 0xff, 0xff },
+ };
+@@ -427,13 +427,13 @@ static struct regval_list ov7670_fmt_rgb565[] = {
+ 	{ REG_RGB444, 0 },	/* No RGB444 please */
+ 	{ REG_COM1, 0x0 },	/* CCIR601 */
+ 	{ REG_COM15, COM15_RGB565 },
+-	{ REG_COM9, 0x38 }, 	/* 16x gain ceiling; 0x8 is reserved bit */
+-	{ 0x4f, 0xb3 }, 	/* "matrix coefficient 1" */
+-	{ 0x50, 0xb3 }, 	/* "matrix coefficient 2" */
++	{ REG_COM9, 0x38 },	/* 16x gain ceiling; 0x8 is reserved bit */
++	{ 0x4f, 0xb3 },		/* "matrix coefficient 1" */
++	{ 0x50, 0xb3 },		/* "matrix coefficient 2" */
+ 	{ 0x51, 0    },		/* vb */
+-	{ 0x52, 0x3d }, 	/* "matrix coefficient 4" */
+-	{ 0x53, 0xa7 }, 	/* "matrix coefficient 5" */
+-	{ 0x54, 0xe4 }, 	/* "matrix coefficient 6" */
++	{ 0x52, 0x3d },		/* "matrix coefficient 4" */
++	{ 0x53, 0xa7 },		/* "matrix coefficient 5" */
++	{ 0x54, 0xe4 },		/* "matrix coefficient 6" */
+ 	{ REG_COM13, COM13_GAMMA|COM13_UVSAT },
+ 	{ 0xff, 0xff },
+ };
+@@ -443,13 +443,13 @@ static struct regval_list ov7670_fmt_rgb444[] = {
+ 	{ REG_RGB444, R444_ENABLE },	/* Enable xxxxrrrr ggggbbbb */
+ 	{ REG_COM1, 0x0 },	/* CCIR601 */
+ 	{ REG_COM15, COM15_R01FE|COM15_RGB565 }, /* Data range needed? */
+-	{ REG_COM9, 0x38 }, 	/* 16x gain ceiling; 0x8 is reserved bit */
+-	{ 0x4f, 0xb3 }, 	/* "matrix coefficient 1" */
+-	{ 0x50, 0xb3 }, 	/* "matrix coefficient 2" */
++	{ REG_COM9, 0x38 },	/* 16x gain ceiling; 0x8 is reserved bit */
++	{ 0x4f, 0xb3 },		/* "matrix coefficient 1" */
++	{ 0x50, 0xb3 },		/* "matrix coefficient 2" */
+ 	{ 0x51, 0    },		/* vb */
+-	{ 0x52, 0x3d }, 	/* "matrix coefficient 4" */
+-	{ 0x53, 0xa7 }, 	/* "matrix coefficient 5" */
+-	{ 0x54, 0xe4 }, 	/* "matrix coefficient 6" */
++	{ 0x52, 0x3d },		/* "matrix coefficient 4" */
++	{ 0x53, 0xa7 },		/* "matrix coefficient 5" */
++	{ 0x54, 0xe4 },		/* "matrix coefficient 6" */
+ 	{ REG_COM13, COM13_GAMMA|COM13_UVSAT|0x2 },  /* Magic rsvd bit */
+ 	{ 0xff, 0xff },
+ };
+@@ -667,7 +667,7 @@ static struct ov7670_format_struct {
+ 	{
+ 		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,
+ 		.colorspace	= V4L2_COLORSPACE_SRGB,
+-		.regs 		= ov7670_fmt_yuv422,
++		.regs		= ov7670_fmt_yuv422,
+ 		.cmatrix	= { 128, -128, 0, -34, -94, 128 },
+ 	},
+ 	{
+@@ -685,7 +685,7 @@ static struct ov7670_format_struct {
+ 	{
+ 		.mbus_code	= MEDIA_BUS_FMT_SBGGR8_1X8,
+ 		.colorspace	= V4L2_COLORSPACE_SRGB,
+-		.regs 		= ov7670_fmt_raw,
++		.regs		= ov7670_fmt_raw,
+ 		.cmatrix	= { 0, 0, 0, 0, 0, 0 },
+ 	},
+ };
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch b/patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
new file mode 100644
index 000000000..335a92c6f
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0529-media-entity-Add-a-nop-variant-of-media_entity_clean.patch
@@ -0,0 +1,63 @@
+From 3580112b6d6f51725ba605c146db14af61e87628 Mon Sep 17 00:00:00 2001
+From: Sakari Ailus <sak...@li...>
+Date: Tue, 9 Jan 2018 05:20:34 -0500
+Subject: [PATCH] media: entity: Add a nop variant of media_entity_cleanup
+
+Add nop variant of media_entity_cleanup. This allows calling
+media_entity_cleanup whether or not Media controller is enabled,
+simplifying driver code.
+
+Also drop #ifdefs on a few drivers around media_entity_cleanup().
+
+Signed-off-by: Sakari Ailus <sak...@li...>
+Reviewed-by: Arnd Bergmann <ar...@ar...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c   | 4 ----
+ include/media/media-entity.h | 6 +++++-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index fd229bc8a0e5..28571de1c2f6 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1846,9 +1846,7 @@ static int ov7670_probe(struct i2c_client *client,
+ 	return 0;
+ 
+ entity_cleanup:
+-#if defined(CONFIG_MEDIA_CONTROLLER)
+ 	media_entity_cleanup(&info->sd.entity);
+-#endif
+ hdl_free:
+ 	v4l2_ctrl_handler_free(&info->hdl);
+ power_off:
+@@ -1867,9 +1865,7 @@ static int ov7670_remove(struct i2c_client *client)
+ 	v4l2_async_unregister_subdev(sd);
+ 	v4l2_ctrl_handler_free(&info->hdl);
+ 	clk_disable_unprepare(info->clk);
+-#if defined(CONFIG_MEDIA_CONTROLLER)
+ 	media_entity_cleanup(&info->sd.entity);
+-#endif
+ 	ov7670_s_power(sd, 0);
+ 	return 0;
+ }
+diff --git a/include/media/media-entity.h b/include/media/media-entity.h
+index d7a669058b5e..a732af1dbba0 100644
+--- a/include/media/media-entity.h
++++ b/include/media/media-entity.h
+@@ -634,7 +634,11 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
+  * This function must be called during the cleanup phase after unregistering
+  * the entity (currently, it does nothing).
+  */
+-static inline void media_entity_cleanup(struct media_entity *entity) {};
++#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
++static inline void media_entity_cleanup(struct media_entity *entity) {}
++#else
++#define media_entity_cleanup(entity) do { } while (false)
++#endif
+ 
+ /**
+  * media_create_pad_link() - creates a link between two entities.
+-- 
+2.16.1
+
diff --git a/patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch b/patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
new file mode 100644
index 000000000..d18b744f1
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0530-media-convert-g-s_parm-to-g-s_frame_interval-in-subd.patch
@@ -0,0 +1,72 @@
+From 4471109e3894f500079d21fea4bc4d58bbdc4045 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <han...@ci...>
+Date: Mon, 22 Jan 2018 04:00:45 -0500
+Subject: [PATCH 530/531] media: convert g/s_parm to g/s_frame_interval in
+ subdevs
+
+Convert all g/s_parm calls to g/s_frame_interval. This allows us
+to remove the g/s_parm ops since those are a duplicate of
+g/s_frame_interval.
+
+Signed-off-by: Hans Verkuil <han...@ci...>
+Acked-by: Sakari Ailus <sak...@li...>
+Signed-off-by: Mauro Carvalho Chehab <mc...@s-...>
+---
+ drivers/media/i2c/ov7670.c | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
+index 28571de1c2f6..31b0c33cfc5b 100644
+--- a/drivers/media/i2c/ov7670.c
++++ b/drivers/media/i2c/ov7670.c
+@@ -1100,30 +1100,24 @@ static int ov7670_get_fmt(struct v4l2_subdev *sd,
+  * Implement G/S_PARM.  There is a "high quality" mode we could try
+  * to do someday; for now, we just do the frame rate tweak.
+  */
+-static int ov7670_g_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
++static int ov7670_g_frame_interval(struct v4l2_subdev *sd,
++				   struct v4l2_subdev_frame_interval *ival)
+ {
+-	struct v4l2_captureparm *cp = &parms->parm.capture;
+ 	struct ov7670_info *info = to_state(sd);
+ 
+-	if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 
+-	cp->capability = V4L2_CAP_TIMEPERFRAME;
+-	info->devtype->get_framerate(sd, &cp->timeperframe);
++	info->devtype->get_framerate(sd, &ival->interval);
+ 
+ 	return 0;
+ }
+ 
+-static int ov7670_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
++static int ov7670_s_frame_interval(struct v4l2_subdev *sd,
++				   struct v4l2_subdev_frame_interval *ival)
+ {
+-	struct v4l2_captureparm *cp = &parms->parm.capture;
+-	struct v4l2_fract *tpf = &cp->timeperframe;
++	struct v4l2_fract *tpf = &ival->interval;
+ 	struct ov7670_info *info = to_state(sd);
+ 
+-	if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 
+-	cp->capability = V4L2_CAP_TIMEPERFRAME;
+ 	return info->devtype->set_framerate(sd, tpf);
+ }
+ 
+@@ -1636,8 +1630,8 @@ static const struct v4l2_subdev_core_ops ov7670_core_ops = {
+ };
+ 
+ static const struct v4l2_subdev_video_ops ov7670_video_ops = {
+-	.s_parm = ov7670_s_parm,
+-	.g_parm = ov7670_g_parm,
++	.s_frame_interval = ov7670_s_frame_interval,
++	.g_frame_interval = ov7670_g_frame_interval,
+ };
+ 
+ static const struct v4l2_subdev_pad_ops ov7670_pad_ops = {
+-- 
+2.16.1
+
diff --git a/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.9.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 72%
copy from patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.9.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
index d6f0477be..62def284b 100644
--- a/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/4.9.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -6,15 +6,15 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
 Signed-off-by: SÃ©bastien Szymanski <seb...@ar...>
 ---
 
-Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
+Index: linux-imx_4.9.11_1.0.0_ga/drivers/clk/imx/clk-imx6q.c
 ===================================================================
---- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/mach-imx/clk-imx6q.c
-+++ linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
-@@ -870,7 +870,12 @@ static void __init imx6q_clocks_init(str
+--- linux-imx_4.9.11_1.0.0_ga.orig/drivers/clk/imx/clk-imx6q.c
++++ linux-imx_4.9.11_1.0.0_ga/drivers/clk/imx/clk-imx6q.c
+@@ -1020,7 +1020,12 @@ static void __init imx6q_clocks_init(str
  
  	/* All existing boards with PCIe use LVDS1 */
  	if (IS_ENABLED(CONFIG_PCI_IMX6)) {
--		imx_clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
+-		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
 +		if (of_machine_is_compatible("armadeus,imx6dl-apf6") ||
 +		    of_machine_is_compatible("armadeus,imx6q-apf6"))
 +			clk_prepare_enable(clk[IMX6QDL_CLK_SATA_REF_100M]);
diff --git a/patch...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, upstream-master, deleted. armadeus-6.0-423-g8a52d62f1

From: SÃ©bastien S. <ss...@us...> - 2018-06-21 12:45:09

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, upstream-master has been deleted
       was  8a52d62f1ce933abc0065aa17ac07cf5fda36917

-----------------------------------------------------------------------
8a52d62f1ce933abc0065aa17ac07cf5fda36917 [BSP] add opos6ullegacy-4.9_defconfig
-----------------------------------------------------------------------


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-422-g13bc33e18

From: SÃ©bastien S. <ss...@us...> - 2018-06-21 08:52:53

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  13bc33e185ea13b0b817c4a03041d46e39aa088a (commit)
      from  3368593cddb1477e790e5c428cba09ba2e26b97b (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 13bc33e185ea13b0b817c4a03041d46e39aa088a
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Thu Jun 21 11:02:24 2018 +0200

    [BUILDROOT] 2018.02.x: update patches for 2018.02.3

-----------------------------------------------------------------------

Summary of changes:
 ...-armadeus-ltrace-cant-be-used-on-old-kernels-anymore.patch | 11 ++++++-----
 patches/buildroot/2018.02/cleanup_buildroot.sh                |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/patches/buildroot/2018.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
index 8550c9dda..48afbcb02 100644
--- a/patches/buildroot/2018.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,20 +7,21 @@ Index: buildroot/package/ltrace/Config.in
 ===================================================================
 --- buildroot.orig/package/ltrace/Config.in
 +++ buildroot/package/ltrace/Config.in
-@@ -3,6 +3,7 @@ config BR2_PACKAGE_LTRACE
+@@ -14,6 +14,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
- 	# 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
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
+	select BR2_PACKAGE_ELFUTILS
+	help
+@@ -24,7 +25,7 @@ config BR2_PACKAGE_LTRACE
  
  	  http://ltrace.org
  
 -comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library"
 +comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, kernel >= 3.0"
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
  	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 -		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 +		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0)
diff --git a/patches/buildroot/2018.02/cleanup_buildroot.sh b/patches/buildroot/2018.02/cleanup_buildroot.sh
index 245ddfa5a..6e493c5ea 100755
--- a/patches/buildroot/2018.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2018.02/cleanup_buildroot.sh
@@ -16,7 +16,9 @@ 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/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


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-421-g3368593cd

From: Julien B a. A. <ar...@us...> - 2018-06-20 15:51:07

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  3368593cddb1477e790e5c428cba09ba2e26b97b (commit)
      from  5ede77c13f0347f740f740c3fead37cd7b23debc (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 3368593cddb1477e790e5c428cba09ba2e26b97b
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jun 20 17:49:54 2018 +0200

    [BUILDROOT] Remove apf27_defconfig (which do not build anymore) and replace it by apf27mainline_defconfig.

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf27_defconfig         | 18 +++---
 buildroot/configs/apf27mainline_defconfig | 94 -------------------------------
 2 files changed, 11 insertions(+), 101 deletions(-)
 delete mode 100644 buildroot/configs/apf27mainline_defconfig

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index d97e96a8b..e9ec8a290 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -5,8 +5,8 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y
+BR2_DEFAULT_KERNEL_VERSION="3.19.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -18,9 +18,8 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
-BR2_ROOTFS_STATIC_DEVICE_TABLE="system/device_table_dev.txt $(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)_device_table_dev.txt"
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
@@ -30,11 +29,14 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
 BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_FPGA_FIRMWARE=y
@@ -55,6 +57,8 @@ BR2_PACKAGE_MTD_MKFSJFFS2=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_DROPBEAR=y
@@ -82,7 +86,7 @@ BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
 BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
deleted file mode 100644
index e9ec8a290..000000000
--- a/buildroot/configs/apf27mainline_defconfig
+++ /dev/null
@@ -1,94 +0,0 @@
-BR2_arm=y
-BR2_WGET="wget --passive-ftp --tries=3"
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
-BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
-BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_PTHREAD_DEBUG=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_TARGET_GENERIC_HOSTNAME="apf27"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="apf27 imx27"
-BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf27"
-BR2_CPU_NAME="imx27"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_FPGA_FIRMWARE=y
-BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
-BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_AD9889CTRL=y
-BR2_PACKAGE_ALSA_UTILS=y
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_JFFS2DUMP=y
-BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_CAN_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_RPCBIND=y
-BR2_PACKAGE_UUCP=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
-BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
-BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
-BR2_TARGET_UBOOT_ENVIMAGE=y
-BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
-BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-420-g5ede77c13

From: SÃ©bastien S. <ss...@us...> - 2018-06-20 13:39:01

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  5ede77c13f0347f740f740c3fead37cd7b23debc (commit)
      from  b6ae5d51902e84a46ecdb3e15c621f96eda03d75 (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 5ede77c13f0347f740f740c3fead37cd7b23debc
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Wed Jun 20 15:49:45 2018 +0200

    [LINUX] opos6ul: bump to 4.17.2

-----------------------------------------------------------------------

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 b86af7495..b6e50224f 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2"
 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"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-419-gb6ae5d519

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

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-418-gff4996400

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  ff499640001df75bacb48cf6bea695e23e11e0c3 (commit)
       via  98e7bae334a49b6911510878cc2a9d21ce9ee80c (commit)
      from  9300ddab00a73baedf940f9f00d0d87390e6a167 (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 ff499640001df75bacb48cf6bea695e23e11e0c3
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Fri Jun 15 17:29:28 2018 +0200

    [LINUX] opos6ul: bump to 4.17.1

commit 98e7bae334a49b6911510878cc2a9d21ce9ee80c
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Fri Jun 15 15:31:28 2018 +0200

    [BUILDROOT] backport patch from upstream to fix libtirp compiling

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul_defconfig                |  2 +-
 ...-libtirpc-fix-compilation-error-of-rpcgen.patch | 34 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 patches/buildroot/2017.02/232-libtirpc-fix-compilation-error-of-rpcgen.patch

diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 9e7bfbe40..b86af7495 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17-rc5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.1"
 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"
diff --git a/patches/buildroot/2017.02/232-libtirpc-fix-compilation-error-of-rpcgen.patch b/patches/buildroot/2017.02/232-libtirpc-fix-compilation-error-of-rpcgen.patch
new file mode 100644
index 000000000..bed88329f
--- /dev/null
+++ b/patches/buildroot/2017.02/232-libtirpc-fix-compilation-error-of-rpcgen.patch
@@ -0,0 +1,34 @@
+From 1521836c4e0d173767d7417fcc2682cb19ca8aba Mon Sep 17 00:00:00 2001
+From: Dagg Stompler <da...@gm...>
+Date: Fri, 29 Dec 2017 15:03:33 +0200
+Subject: [PATCH] libtirpc: fix compilation error of rpcgen
+
+When compiling libtirpc, without RPC support available on the host
+machine, the build of the rpcgen host program because it cannot find
+the netconfig.h and rpc/types.h headers. Instead of relying on the
+system-provided ones, let's use the ones included in the libtirpc
+source code by patching the rpcgen build logic.
+
+Signed-off-by: Dagg Stompler <da...@gm...>
+[Thomas: reword commit log.]
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+ package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch b/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch
+index 1cf861417c..f2b15fe2f1 100644
+--- a/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch
++++ b/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch
+@@ -83,7 +83,7 @@ index 0000000..2277b6f
+ --- /dev/null
+ +++ b/rpcgen/Makefile.am
+ @@ -0,0 +1,22 @@
+-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -I../tirpc $(AM_CPPFLAGS) \
+ +	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
+ +LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
+ +
+-- 
+2.16.4
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-416-g9300ddab0

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  9300ddab00a73baedf940f9f00d0d87390e6a167 (commit)
       via  5abbfa4f8deeb82edfb21a59f50ee2b0ee10bb01 (commit)
      from  ff038cd065f60ab03710fdadef7942a1445b32a9 (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 9300ddab00a73baedf940f9f00d0d87390e6a167
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue May 29 09:54:29 2018 +0200

    [LINUX] 4.1: port patch 0700 from 3.14

commit 5abbfa4f8deeb82edfb21a59f50ee2b0ee10bb01
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue May 29 09:53:05 2018 +0200

    [LINUX] 4.1: apf6: enable PCIe

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf6/apf6legacy-linux-4.1.config      |  3 +++
 .../0700-armadeus-pcie_clk_defined_in_uboot.patch  | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 copy patches/linux/{3.19 => 4.1.mx6_legacy}/0700-armadeus-pcie_clk_defined_in_uboot.patch (55%)

diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
index 32035ebec..0c4544f61 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
@@ -23,6 +23,9 @@ CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6ULL=y
 # CONFIG_SWP_EMULATE is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_VMSPLIT_2G=y
diff --git a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 55%
copy from patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
index 05907405c..d6f0477be 100644
--- a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -6,23 +6,21 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
 Signed-off-by: SÃ©bastien Szymanski <seb...@ar...>
 ---
 
-Index: linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
 ===================================================================
---- linux-3.19.3.orig/arch/arm/mach-imx/clk-imx6q.c
-+++ linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
-@@ -522,8 +522,13 @@ static void __init imx6q_clocks_init(str
- 	clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
+--- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/mach-imx/clk-imx6q.c
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
+@@ -870,7 +870,12 @@ static void __init imx6q_clocks_init(str
  
  	/* All existing boards with PCIe use LVDS1 */
--	if (IS_ENABLED(CONFIG_PCI_IMX6))
--		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
-+	if (IS_ENABLED(CONFIG_PCI_IMX6)) {
+ 	if (IS_ENABLED(CONFIG_PCI_IMX6)) {
+-		imx_clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
 +		if (of_machine_is_compatible("armadeus,imx6dl-apf6") ||
 +		    of_machine_is_compatible("armadeus,imx6q-apf6"))
 +			clk_prepare_enable(clk[IMX6QDL_CLK_SATA_REF_100M]);
 +		else
 +			clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
-+	}
- 
- 	/* Set initial power mode */
-	imx6q_set_lpm(WAIT_CLOCKED);
++
+ 		np = of_find_compatible_node(NULL, NULL, "snps,dw-pcie");
+ 		 /* external oscillator is used or not. */
+ 		if (of_property_read_u32(np, "ext_osc", &val) < 0)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-414-gff038cd06

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  ff038cd065f60ab03710fdadef7942a1445b32a9 (commit)
      from  793114bdc62c8dfea6ec1bdea87e2c2b316cc7ff (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 ff038cd065f60ab03710fdadef7942a1445b32a9
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Wed May 23 11:53:01 2018 +0200

    [BUILDROOT] leptonmodule: add patch to fix Makefile

-----------------------------------------------------------------------

Summary of changes:
 .../2017.02/031-armadeus-lepton-fix-makefile.patch | 35 ++++++++++++++++++++++
 patches/buildroot/2017.02/cleanup_buildroot.sh     |  1 +
 .../2018.02/031-armadeus-lepton-fix-makefile.patch | 35 ++++++++++++++++++++++
 patches/buildroot/2018.02/cleanup_buildroot.sh     |  1 +
 4 files changed, 72 insertions(+)
 create mode 100644 patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
 create mode 100644 patches/buildroot/2018.02/031-armadeus-lepton-fix-makefile.patch

diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
new file mode 100644
index 000000000..90751a300
--- /dev/null
+++ b/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
@@ -0,0 +1,35 @@
+Index: buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
+@@ -0,0 +1,30 @@
++From 15d27d1a24e83aaa0a0f6c8a43e502f76272fb08 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
++ <seb...@ar...>
++Date: Wed, 23 May 2018 10:28:30 +0200
++Subject: [PATCH v2 1/1] flirpi: add missing dependency to leptcam target
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Signed-off-by: SÃ©bastien Szymanski <seb...@ar...>
++---
++ software/flirpi/Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/software/flirpi/Makefile b/software/flirpi/Makefile
++index 3f6eb0b..2f55832 100644
++--- a/software/flirpi/Makefile
+++++ b/software/flirpi/Makefile
++@@ -3,7 +3,7 @@ CFLAGS = -Wall
++
++ all: leptbmp fblept leptgraypng leptcam
++
++-leptcam: leptcam.o
+++leptcam: leptcam.c leptsci.o
++ 	$(CC) -o leptcam leptcam.c leptsci.o -lpthread $(CFLAGS)
++
++ leptgraypng: leptgraypng.c leptsci.o
++--
++2.16.1
++
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index c4396fa16..0aba335e8 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -69,6 +69,7 @@ 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/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
 rm -rf buildroot/package/leptonmodule/Config.in
 rm -rf buildroot/package/leptonmodule/leptonmodule.mk
 rm -rf buildroot/package/libmbim/libmbim.hash
diff --git a/patches/buildroot/2018.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2018.02/031-armadeus-lepton-fix-makefile.patch
new file mode 100644
index 000000000..90751a300
--- /dev/null
+++ b/patches/buildroot/2018.02/031-armadeus-lepton-fix-makefile.patch
@@ -0,0 +1,35 @@
+Index: buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
+@@ -0,0 +1,30 @@
++From 15d27d1a24e83aaa0a0f6c8a43e502f76272fb08 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
++ <seb...@ar...>
++Date: Wed, 23 May 2018 10:28:30 +0200
++Subject: [PATCH v2 1/1] flirpi: add missing dependency to leptcam target
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++Signed-off-by: SÃ©bastien Szymanski <seb...@ar...>
++---
++ software/flirpi/Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/software/flirpi/Makefile b/software/flirpi/Makefile
++index 3f6eb0b..2f55832 100644
++--- a/software/flirpi/Makefile
+++++ b/software/flirpi/Makefile
++@@ -3,7 +3,7 @@ CFLAGS = -Wall
++
++ all: leptbmp fblept leptgraypng leptcam
++
++-leptcam: leptcam.o
+++leptcam: leptcam.c leptsci.o
++ 	$(CC) -o leptcam leptcam.c leptsci.o -lpthread $(CFLAGS)
++
++ leptgraypng: leptgraypng.c leptsci.o
++--
++2.16.1
++
diff --git a/patches/buildroot/2018.02/cleanup_buildroot.sh b/patches/buildroot/2018.02/cleanup_buildroot.sh
index ed3947169..245ddfa5a 100755
--- a/patches/buildroot/2018.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2018.02/cleanup_buildroot.sh
@@ -59,6 +59,7 @@ 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.mk
+rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
 rm -rf buildroot/package/leptonmodule/Config.in
 rm -rf buildroot/package/leptonmodule/leptonmodule.mk
 rm -rf buildroot/package/libmbim/libmbim.hash


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-413-g793114bdc

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  793114bdc62c8dfea6ec1bdea87e2c2b316cc7ff (commit)
      from  ff4d27a0d1a6942e65990a4cbb4e8682444d1d1d (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 793114bdc62c8dfea6ec1bdea87e2c2b316cc7ff
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue May 22 11:56:13 2018 +0200

    [UBOOT] opos6ul/opos6ullegacy-4.1: bump to latest U-Boot

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul_defconfig           | 2 +-
 buildroot/configs/opos6ullegacy-4.1_defconfig | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 5e339ac64..9e7bfbe40 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -129,7 +129,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="68a4ad891043c40a8f29a5aaa593ec49d30f30d4"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2e56ba2a9c03584305e01146b945ffc11842fd33"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6uldev"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index 7e0a33735..d05518d8f 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -161,9 +161,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="opos6ul"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos6ul"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2e56ba2a9c03584305e01146b945ffc11842fd33"
+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


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-412-gff4d27a0d

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  ff4d27a0d1a6942e65990a4cbb4e8682444d1d1d (commit)
      from  4a81729a50059503f0269fffb3412ec80d077595 (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 ff4d27a0d1a6942e65990a4cbb4e8682444d1d1d
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue May 22 10:58:20 2018 +0200

    [BUILDROOT] opos6ul: update defconfig

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul_defconfig | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index fd40b78ff..5e339ac64 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -6,12 +6,10 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_ENABLE_LOCALE_PURGE=y
 BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_TARGET_TZ_INFO=y
 BR2_TARGET_TZ_ZONELIST="europe"
 BR2_TARGET_LOCALTIME="Europe/Paris"
 BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
@@ -47,7 +45,6 @@ BR2_PACKAGE_RT_TESTS=y
 BR2_PACKAGE_SPIDEV_TEST=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
-BR2_PACKAGE_HWDATA=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -64,6 +61,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
 BR2_PACKAGE_APF_CONFIG=y
 BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_HWDATA=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LEPTONMODULE=y
@@ -75,8 +73,6 @@ BR2_PACKAGE_PYTHON3_DECIMAL=y
 BR2_PACKAGE_PYTHON3_READLINE=y
 BR2_PACKAGE_PYTHON3_SSL=y
 BR2_PACKAGE_PYTHON3_SQLITE=y
-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


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-411-g4a81729a5

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  4a81729a50059503f0269fffb3412ec80d077595 (commit)
      from  6061c273151db724030c4f95ec53d240c7320598 (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 4a81729a50059503f0269fffb3412ec80d077595
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Tue May 22 10:27:56 2018 +0200

    [BUILDROOT] opos6ul/opos6ul_nano: properly set NEON/VFP

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/opos6ul-preempt-rt_defconfig     | 1 +
 buildroot/configs/opos6ul_defconfig                | 1 +
 buildroot/configs/opos6ul_legacy_defconfig         | 1 +
 buildroot/configs/opos6ul_recovery_defconfig       | 1 +
 buildroot/configs/opos6ullegacy-4.1_defconfig      | 1 +
 buildroot/configs/opos6ulnano-preempt-rt_defconfig | 1 +
 buildroot/configs/opos6ulnano_defconfig            | 1 +
 buildroot/configs/opos6ultest_defconfig            | 1 +
 8 files changed, 8 insertions(+)

diff --git a/buildroot/configs/opos6ul-preempt-rt_defconfig b/buildroot/configs/opos6ul-preempt-rt_defconfig
index 0f4562b55..4af863088 100644
--- a/buildroot/configs/opos6ul-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ul-preempt-rt_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 7e85da45d..fd40b78ff 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index e17cd3c0a..c3470c308 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ul_recovery_defconfig b/buildroot/configs/opos6ul_recovery_defconfig
index 24a885196..46c3bea03 100644
--- a/buildroot/configs/opos6ul_recovery_defconfig
+++ b/buildroot/configs/opos6ul_recovery_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index fa1c1dd05..7e0a33735 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index 009b553e7..436cb3962 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 358fb8c33..c487d74e6 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index bc84e1e02..231a95087 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-410-g6061c2731

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  6061c273151db724030c4f95ec53d240c7320598 (commit)
      from  f0d7625b54158b57f9af703d69ac51f0dc73e96a (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 6061c273151db724030c4f95ec53d240c7320598
Author: SÃ©bastien Szymanski <seb...@ar...>
Date:   Thu May 17 14:25:41 2018 +0200

    [LINUX] 4.17: remove renames from patch 0100
    
    Because on BR 2018.02.x, patches with renames are not apply anymore [1]
    
    [1] https://git.buildroot.net/buildroot/commit/?id=85f11d08c387c200dbb59a8559f2ba62376689bf

-----------------------------------------------------------------------

Summary of changes:
 ...s6ul-rework-device-tree-to-support-i.MX6U.patch | 429 +++++++++++++++++++--
 1 file changed, 401 insertions(+), 28 deletions(-)

diff --git a/patches/linux/4.17/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
index c064b5c8f..30d4741ba 100644
--- a/patches/linux/4.17/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
@@ -13,14 +13,16 @@ 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%)
+ arch/arm/boot/dts/Makefile                       |   3 +-
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi    | 190 +++++++++++
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 406 +++++++++++++++++++++++
+ arch/arm/boot/dts/imx6ul-opos6ul.dtsi            | 192 -----------
+ arch/arm/boot/dts/imx6ul-opos6uldev.dts          | 366 +-------------------
+ arch/arm/boot/dts/imx6ull-opos6uldev.dts         |  56 ++++
+ 6 files changed, 659 insertions(+), 554 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
  create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+ delete mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.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
@@ -37,29 +39,202 @@ index 7e2424957809..eb5ed60b92a2 100644
  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
+diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+new file mode 100644
+index 000000000000..a4621f3688e3
+--- /dev/null
 +++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2017 Armadeus Systems <su...@ar...>
+@@ -0,0 +1,190 @@
++/*
 + * 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@80000000 {
- 		reg = <0x80000000 0>; /* will be filled by U-Boot */
++ *
++ * 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.
++ */
++
++/ {
++	memory@80000000 {
++		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 = <&ethphy1>;
++	phy-supply = <&reg_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>;
++	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: wifi@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
++		>;
++	};
++};
 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
@@ -472,6 +647,204 @@ index 000000000000..0b79a246a07f
 +		>;
 +	};
 +};
+diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+deleted file mode 100644
+index a031bee311df..000000000000
+--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ /dev/null
+@@ -1,192 +0,0 @@
+-/*
+- * 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.
+- */
+-
+-#include "imx6ul.dtsi"
+-
+-/ {
+-	memory@80000000 {
+-		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 = <&ethphy1>;
+-	phy-supply = <&reg_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>;
+-	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: wifi@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
+-		>;
+-	};
+-};
 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


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 153 > >> (Page 20 of 153)