armadeus-commitlog Mailing List for armadeus (Page 7)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: sszy <ss...@us...> - 2023-04-05 09:02:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3a68a525a7f4056e241d480a7190cc7b7e53f284 (commit)
from 5afad641f862861ffe71bae3c202f64855bc147d (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 3a68a525a7f4056e241d480a7190cc7b7e53f284
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 5 11:00:48 2023 +0200
[LINUX] 5.10: patches for apf27
-----------------------------------------------------------------------
Summary of changes:
...0200-ARM-dts-apf27-add-I2C-EEPROM-support.patch | 89 ++++++++++++++++++++++
...01-ARM-dts-apf27dev-fix-user-led-polarity.patch | 32 ++++++++
...02-ARM-dts-apf27dev-fix-user-key-polarity.patch | 32 ++++++++
.../0203-ARM-dts-apf27-add-USB-OTG-support.patch | 72 +++++++++++++++++
4 files changed, 225 insertions(+)
create mode 100644 patches/linux/5.10/0200-ARM-dts-apf27-add-I2C-EEPROM-support.patch
create mode 100644 patches/linux/5.10/0201-ARM-dts-apf27dev-fix-user-led-polarity.patch
create mode 100644 patches/linux/5.10/0202-ARM-dts-apf27dev-fix-user-key-polarity.patch
create mode 100644 patches/linux/5.10/0203-ARM-dts-apf27-add-USB-OTG-support.patch
diff --git a/patches/linux/5.10/0200-ARM-dts-apf27-add-I2C-EEPROM-support.patch b/patches/linux/5.10/0200-ARM-dts-apf27-add-I2C-EEPROM-support.patch
new file mode 100644
index 000000000..04df78d89
--- /dev/null
+++ b/patches/linux/5.10/0200-ARM-dts-apf27-add-I2C-EEPROM-support.patch
@@ -0,0 +1,89 @@
+From 1ded813c1f281ce78889e97967c516b3f8ff17bb Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Wed, 15 Mar 2023 15:00:29 +0100
+Subject: [PATCH 200/203] ARM: dts: apf27: add I2C EEPROM support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+APF27 SoM has an EEPROM on the I2C2 bus, add support of it.
+Move I2C2 node from APF27Dev board to APF27 SoM.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27.dts | 19 +++++++++++++++++++
+ arch/arm/boot/dts/imx27-apf27dev.dts | 13 -------------
+ 2 files changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
+index 745d5d409952..89dba47aa8f3 100644
+--- a/arch/arm/boot/dts/imx27-apf27.dts
++++ b/arch/arm/boot/dts/imx27-apf27.dts
+@@ -48,6 +48,13 @@ MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
+ >;
+ };
+
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
++ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
++ >;
++ };
++
+ pinctrl_uart1: uart1grp {
+ fsl,pins = <
+ MX27_PAD_UART1_TXD__UART1_TXD 0x0
+@@ -69,6 +76,18 @@ &fec {
+ status = "okay";
+ };
+
++&i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2>;
++ status = "okay";
++
++ eeprom@50 {
++ compatible = "atmel,24c02";
++ reg = <0x50>;
++ pagesize = <8>;
++ };
++};
++
+ &nfc {
+ status = "okay";
+ nand-bus-width = <16>;
+diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
+index 6f1e8ce9e76e..66f360ded1c8 100644
+--- a/arch/arm/boot/dts/imx27-apf27dev.dts
++++ b/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -122,12 +122,6 @@ max5821@38 {
+ };
+ };
+
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2>;
+- status = "okay";
+-};
+-
+ &iomuxc {
+ imx27-apf27dev {
+ pinctrl_cspi1: cspi1grp {
+@@ -205,13 +199,6 @@ MX27_PAD_I2C_CLK__I2C_CLK 0x0
+ >;
+ };
+
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
+- MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
+- >;
+- };
+-
+ pinctrl_max1027: max1027 {
+ fsl,pins = <
+ MX27_PAD_UART1_CTS__GPIO5_14 0x0 /* CNVST */
+--
+2.39.2
+
diff --git a/patches/linux/5.10/0201-ARM-dts-apf27dev-fix-user-led-polarity.patch b/patches/linux/5.10/0201-ARM-dts-apf27dev-fix-user-led-polarity.patch
new file mode 100644
index 000000000..8950ff9b4
--- /dev/null
+++ b/patches/linux/5.10/0201-ARM-dts-apf27dev-fix-user-led-polarity.patch
@@ -0,0 +1,32 @@
+From fb3328c9d5341a658979756cca81c906ac6467ca Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Wed, 15 Mar 2023 15:27:52 +0100
+Subject: [PATCH 201/203] ARM: dts: apf27dev: fix user led polarity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The led is active low.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27dev.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
+index 66f360ded1c8..ca6458a8fe31 100644
+--- a/arch/arm/boot/dts/imx27-apf27dev.dts
++++ b/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -49,7 +49,7 @@ leds {
+
+ user {
+ label = "Heartbeat";
+- gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
++ gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+--
+2.39.2
+
diff --git a/patches/linux/5.10/0202-ARM-dts-apf27dev-fix-user-key-polarity.patch b/patches/linux/5.10/0202-ARM-dts-apf27dev-fix-user-key-polarity.patch
new file mode 100644
index 000000000..b7b8a3fc5
--- /dev/null
+++ b/patches/linux/5.10/0202-ARM-dts-apf27dev-fix-user-key-polarity.patch
@@ -0,0 +1,32 @@
+From 5de000642a4bab89b78f6f34d20e9bf38ddb4668 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 15 Mar 2023 16:44:47 +0100
+Subject: [PATCH 202/203] ARM: dts: apf27dev: fix user key polarity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The key is active low.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27dev.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
+index ca6458a8fe31..577eebf6f374 100644
+--- a/arch/arm/boot/dts/imx27-apf27dev.dts
++++ b/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -37,7 +37,7 @@ gpio-keys {
+
+ user-key {
+ label = "user";
+- gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;
++ gpios = <&gpio6 13 GPIO_ACTIVE_LOW>;
+ linux,code = <276>; /* BTN_EXTRA */
+ };
+ };
+--
+2.39.2
+
diff --git a/patches/linux/5.10/0203-ARM-dts-apf27-add-USB-OTG-support.patch b/patches/linux/5.10/0203-ARM-dts-apf27-add-USB-OTG-support.patch
new file mode 100644
index 000000000..6a83d41c5
--- /dev/null
+++ b/patches/linux/5.10/0203-ARM-dts-apf27-add-USB-OTG-support.patch
@@ -0,0 +1,72 @@
+From 20fade1682ce803fd9e276ca2d7f58c6b1ae82a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 16 Mar 2023 10:59:55 +0100
+Subject: [PATCH 203/203] ARM: dts: apf27: add USB OTG support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx27-apf27.dts | 33 +++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
+index 89dba47aa8f3..32232cce9f06 100644
+--- a/arch/arm/boot/dts/imx27-apf27.dts
++++ b/arch/arm/boot/dts/imx27-apf27.dts
+@@ -17,6 +17,12 @@ memory@a0000000 {
+ device_type = "memory";
+ reg = <0xa0000000 0x04000000>;
+ };
++
++ usbotgphy0: usbphy@0 {
++ #phy-cells = <0>;
++ compatible = "usb-nop-xceiv";
++ status = "okay";
++ };
+ };
+
+ &clk_osc26m {
+@@ -61,6 +67,23 @@ MX27_PAD_UART1_TXD__UART1_TXD 0x0
+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ >;
+ };
++
++ pinctrl_usbotg: usbotg {
++ fsl,pins = <
++ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
++ MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
++ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
++ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
++ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
++ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
++ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
++ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
++ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
++ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
++ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
++ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
++ >;
++ };
+ };
+ };
+
+@@ -129,3 +152,13 @@ partition@800000 {
+ reg = <0x800000 0xf800000>;
+ };
+ };
++
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ phys = <&usbotgphy0>;
++ phy_names = "usb-phy";
++ phy_type = "ulpi";
++ disable-over-current;
++ status = "okay";
++};
+--
+2.39.2
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-03-20 09:00:47
|
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 5afad641f862861ffe71bae3c202f64855bc147d (commit)
from 78f19475945db8618d841de43e1b055853a1991b (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 5afad641f862861ffe71bae3c202f64855bc147d
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Mar 20 09:56:31 2023 +0100
[BUILDROOT] Bump BR to 2022.02.11
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f4bed6d38..29ed2ba13 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 10
+BUILDROOT_MINOR_VERSION ?= 11
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-03-02 08:47:55
|
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 78f19475945db8618d841de43e1b055853a1991b (commit)
from b4eb3d2e1c604138b799c5f4782ad560b3a85962 (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 78f19475945db8618d841de43e1b055853a1991b
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 2 09:08:11 2023 +0100
[BUILDROOT] Bump BR to 2022.02.10
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c312121b5..f4bed6d38 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 9
+BUILDROOT_MINOR_VERSION ?= 10
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-03-01 16:40:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b4eb3d2e1c604138b799c5f4782ad560b3a85962 (commit)
from b3047dec5fd5254eed42784d0a478970096e60c8 (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 b4eb3d2e1c604138b799c5f4782ad560b3a85962
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Mar 1 17:40:18 2023 +0100
[BUILDROOT] 2022.02: bump cog version
-----------------------------------------------------------------------
Summary of changes:
.../2022.02/006-armadeus-bump-cog-version.patch | 224 +++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +
2 files changed, 229 insertions(+)
create mode 100644 patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
diff --git a/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch b/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
new file mode 100644
index 000000000..81276d834
--- /dev/null
+++ b/patches/buildroot/2022.02/006-armadeus-bump-cog-version.patch
@@ -0,0 +1,224 @@
+Bump cog package & reactivate mouse cursor while we are at it.
+
+Bump is from BR mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/cog/cog.mk
+===================================================================
+--- buildroot.orig/package/cog/cog.mk
++++ buildroot/package/cog/cog.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-COG_VERSION = 0.12.4
++COG_VERSION = 0.16.1
+ COG_SITE = https://wpewebkit.org/releases
+ COG_SOURCE = cog-$(COG_VERSION).tar.xz
+ COG_INSTALL_STAGING = YES
+@@ -12,31 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebac
+ COG_LICENSE = MIT
+ COG_LICENSE_FILES = COPYING
+ COG_CONF_OPTS = \
+- -DCOG_BUILD_PROGRAMS=ON \
+- -DCOG_PLATFORM_HEADLESS=ON \
+- -DCOG_WESTON_DIRECT_DISPLAY=OFF \
+- -DINSTALL_MAN_PAGES=OFF \
+- -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \
+- -DUSE_SOUP2=ON
++ -Ddocumentation=false \
++ -Dmanpages=false \
++ -Dprograms=true \
++ -Dsoup2=enabled \
++ -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \
++ -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))'
++
++COG_PLATFORMS_LIST = headless
++
++ifeq ($(BR2_PACKAGE_WESTON),y)
++COG_CONF_OPTS += -Dwayland_weston_direct_display=true
++COG_DEPENDENCIES += weston
++else
++COG_CONF_OPTS += -Dwayland_weston_direct_display=false
++endif
+
+ ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y)
+-COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON
++COG_PLATFORMS_LIST += wayland
+ COG_DEPENDENCIES += libxkbcommon wayland-protocols
+-else
+-COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF
+ endif
+
+ ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y)
+-COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON
++COG_PLATFORMS_LIST += drm
+ COG_DEPENDENCIES += libdrm libinput libgbm libegl udev
+-else
+-COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF
+ endif
+
+ ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y)
+-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON
++COG_CONF_OPTS += -Dcog_dbus_control=system
+ else
+-COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF
++COG_CONF_OPTS += -Dcog_dbus_control=user
++endif
++
++ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
++COG_DEPENDENCIES += libmanette
+ endif
+
+-$(eval $(cmake-package))
++$(eval $(meson-package))
+Index: buildroot/package/cog/cog.hash
+===================================================================
+--- buildroot.orig/package/cog/cog.hash
++++ buildroot/package/cog/cog.hash
+@@ -3,5 +3,15 @@ md5 cdb8acdc3acc9b5082e7db9c279155c3 c
+ sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz
+ sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz
+
++# From cog-0.14.0.tar.xz (119.8 KiB)
++md5 2705472ea4f333290973722c0862b21d cog-0.16.0.tar.xz
++sha1 ef16e5e3d91d0da056fe5e4f596c211af7453b4e cog-0.16.0.tar.xz
++sha256 2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6 cog-0.16.0.tar.xz
++
++# From https://wpewebkit.org/releases/cog-0.16.1.tar.xz.sums
++md5 1489740db6b4ea568578035c30b8b2f4 cog-0.16.1.tar.xz
++sha1 1235203085e7ccd8fc76eab6bdfcdb2e3ae38ea9 cog-0.16.1.tar.xz
++sha256 37c5f14123b8dcf077839f6c60f0d721d2a91bb37829e796f420126e6b0d38b5 cog-0.16.1.tar.xz
++
+ # Hashes for license files:
+ sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
+Index: buildroot/package/weston/weston.mk
+===================================================================
+--- buildroot.orig/package/weston/weston.mk
++++ buildroot/package/weston/weston.mk
+@@ -10,6 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION)
+ WESTON_LICENSE = MIT
+ WESTON_LICENSE_FILES = COPYING
+ WESTON_CPE_ID_VENDOR = wayland
++WESTON_INSTALL_STAGING = YES
+
+ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
+ libxkbcommon pixman libpng udev cairo libinput libdrm
+Index: buildroot/package/cog/0001-make-cursor-great-again.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/cog/0001-make-cursor-great-again.patch
+@@ -0,0 +1,112 @@
++Make COG pointer great again...
++
++(backport from cog mainline)
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-5.10.167/Documentation/dontdiff cog-0.16.1.org/platform/wayland/cog-platform-wl.c cog-0.16.1/platform/wayland/cog-platform-wl.c
++--- cog-0.16.1.org/platform/wayland/cog-platform-wl.c 2023-03-01 16:40:19.799063958 +0100
+++++ cog-0.16.1/platform/wayland/cog-platform-wl.c 2023-03-01 16:42:25.246512793 +0100
++@@ -173,7 +173,6 @@
++ #endif
++
++ #ifdef COG_USE_WAYLAND_CURSOR
++- struct wl_shm *wl_shm;
++ struct wl_cursor_theme *cursor_theme;
++ struct wl_cursor *cursor_left_ptr;
++ struct wl_surface *cursor_left_ptr_surface;
++@@ -1177,10 +1176,9 @@
++ && xkb_compose_state_get_status (xkb_data.compose_state)
++ == XKB_COMPOSE_COMPOSED) {
++ keysym = xkb_compose_state_get_one_sym (xkb_data.compose_state);
++- unicode = xkb_keysym_to_utf32 (keysym);
++ }
++
++- struct wpe_input_keyboard_event event = {time, keysym, unicode, state == true, xkb_data.modifiers};
+++ struct wpe_input_keyboard_event event = {time, keysym, key, state == true, xkb_data.modifiers};
++
++ wpe_view_backend_dispatch_keyboard_event (wpe_view_data.backend, &event);
++ }
++@@ -1654,6 +1652,20 @@
++ static void
++ on_export_wl_egl_image(void *data, struct wpe_fdo_egl_exported_image *image)
++ {
+++ const uint32_t surface_pixel_width = wl_data.current_output.scale * win_data.width;
+++ const uint32_t surface_pixel_height = wl_data.current_output.scale * win_data.height;
+++
+++ if (surface_pixel_width != wpe_fdo_egl_exported_image_get_width(image) ||
+++ surface_pixel_height != wpe_fdo_egl_exported_image_get_height(image)) {
+++ g_debug("Exported FDO EGL image size %" PRIu32 "x%" PRIu32 ", does not match surface size %" PRIu32 "x%" PRIu32
+++ ", skipping.",
+++ wpe_fdo_egl_exported_image_get_width(image), wpe_fdo_egl_exported_image_get_height(image),
+++ surface_pixel_width, surface_pixel_width);
+++ wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe_host_data.exportable);
+++ wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(wpe_host_data.exportable, image);
+++ return;
+++ }
+++
++ wpe_view_data.image = image;
++
++ if (wpe_view_data.should_update_opaque_region) {
++@@ -1682,10 +1694,7 @@
++ wl_buffer_add_listener(wpe_view_data.buffer, &buffer_listener, image);
++
++ wl_surface_attach (win_data.wl_surface, wpe_view_data.buffer, 0, 0);
++- wl_surface_damage (win_data.wl_surface,
++- 0, 0,
++- win_data.width * wl_data.current_output.scale,
++- win_data.height * wl_data.current_output.scale);
+++ wl_surface_damage(win_data.wl_surface, 0, 0, surface_pixel_width, surface_pixel_height);
++
++ request_frame ();
++
++@@ -1798,6 +1807,21 @@
++ struct wl_resource *exported_resource = wpe_fdo_shm_exported_buffer_get_resource (exported_buffer);
++ struct wl_shm_buffer *exported_shm_buffer = wpe_fdo_shm_exported_buffer_get_shm_buffer (exported_buffer);
++
+++ const uint32_t surface_pixel_width = wl_data.current_output.scale * win_data.width;
+++ const uint32_t surface_pixel_height = wl_data.current_output.scale * win_data.height;
+++
+++ if (surface_pixel_width != wl_shm_buffer_get_width(exported_shm_buffer) ||
+++ surface_pixel_height != wl_shm_buffer_get_height(exported_shm_buffer)) {
+++ g_debug("Exported SHM buffer size %" PRIu32 "x%" PRIu32 ", does not match surface size %" PRIu32 "x%" PRIu32
+++ ", skipping.",
+++ wl_shm_buffer_get_width(exported_shm_buffer), wl_shm_buffer_get_width(exported_shm_buffer),
+++ surface_pixel_width, surface_pixel_width);
+++ wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe_host_data.exportable);
+++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable,
+++ exported_buffer);
+++ return;
+++ }
+++
++ struct shm_buffer *buffer = shm_buffer_for_resource (exported_resource);
++ if (!buffer) {
++ int32_t width;
++@@ -1979,14 +2003,11 @@
++ wl_display_roundtrip (wl_data.display);
++
++ #if COG_USE_WAYLAND_CURSOR
++- if (wl_data.wl_shm) {
++- if (!(wl_data.cursor_theme = wl_cursor_theme_load (NULL,
++- 32,
++- wl_data.wl_shm))) {
++- g_warning ("%s: Could not load cursor theme.", G_STRFUNC);
++- } else if (!(wl_data.cursor_left_ptr =
++- wl_cursor_theme_get_cursor (wl_data.cursor_theme, "left_ptr"))) {
++- g_warning ("%s: Could not load left_ptr cursor.", G_STRFUNC);
+++ if (wl_data.shm) {
+++ if (!(wl_data.cursor_theme = wl_cursor_theme_load(NULL, 32, wl_data.shm))) {
+++ g_warning("%s: Could not load cursor theme.", G_STRFUNC);
+++ } else if (!(wl_data.cursor_left_ptr = wl_cursor_theme_get_cursor(wl_data.cursor_theme, "left_ptr"))) {
+++ g_warning("%s: Could not load left_ptr cursor.", G_STRFUNC);
++ }
++ }
++ #endif /* COG_USE_WAYLAND_CURSOR */
++@@ -2027,7 +2048,6 @@
++ #ifdef COG_USE_WAYLAND_CURSOR
++ g_clear_pointer (&wl_data.cursor_left_ptr_surface, wl_surface_destroy);
++ g_clear_pointer (&wl_data.cursor_theme, wl_cursor_theme_destroy);
++- g_clear_pointer (&wl_data.wl_shm, wl_shm_destroy);
++ #endif /* COG_USE_WAYLAND_CURSOR */
++
++ wl_registry_destroy (wl_data.registry);
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index b20407be1..b9faa4f11 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -23,6 +23,10 @@ rm -rf buildroot/package/busybox/S10mdev
rm -rf buildroot/package/cmux/Config.in
rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
+rm -rf buildroot/package/cog/0001-make-cursor-great-again.patch
+rm -rf buildroot/package/cog/Config.in
+rm -rf buildroot/package/cog/cog.hash
+rm -rf buildroot/package/cog/cog.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
@@ -89,6 +93,7 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
+rm -rf buildroot/package/weston/weston.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/xc3sprog/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-02-27 14:35:11
|
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 b3047dec5fd5254eed42784d0a478970096e60c8 (commit)
via b11889aade0d09b97dfede4ef17a7d17d318c884 (commit)
from 83c25cc881d0c35b5bf74b2c5f2f5d6f391e6667 (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 b3047dec5fd5254eed42784d0a478970096e60c8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Feb 27 15:34:17 2023 +0100
[ROOTFS] overlay: add /etc/i18n/*.kmap to have correct layout for graphical console login
commit b11889aade0d09b97dfede4ef17a7d17d318c884
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Feb 27 15:32:47 2023 +0100
[BUILD] add tips to export_linux_config.sh
-----------------------------------------------------------------------
Summary of changes:
.../{target_skeleton => target_overlay}/etc/i18n/de.kmap | Bin
.../{target_skeleton => target_overlay}/etc/i18n/de_SG.kmap | Bin
.../{target_skeleton => target_overlay}/etc/i18n/es_CA.kmap | Bin
.../{target_skeleton => target_overlay}/etc/i18n/fr.kmap | Bin
scripts/export_linux_config.sh | 2 ++
5 files changed, 2 insertions(+)
copy buildroot/target/device/armadeus/rootfs/{target_skeleton => target_overlay}/etc/i18n/de.kmap (100%)
copy buildroot/target/device/armadeus/rootfs/{target_skeleton => target_overlay}/etc/i18n/de_SG.kmap (100%)
copy buildroot/target/device/armadeus/rootfs/{target_skeleton => target_overlay}/etc/i18n/es_CA.kmap (100%)
copy buildroot/target/device/armadeus/rootfs/{target_skeleton => target_overlay}/etc/i18n/fr.kmap (100%)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/de.kmap b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/de.kmap
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/de.kmap
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/de.kmap
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/de_SG.kmap b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/de_SG.kmap
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/de_SG.kmap
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/de_SG.kmap
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/es_CA.kmap b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/es_CA.kmap
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/es_CA.kmap
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/es_CA.kmap
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/fr.kmap b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/fr.kmap
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/etc/i18n/fr.kmap
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/i18n/fr.kmap
diff --git a/scripts/export_linux_config.sh b/scripts/export_linux_config.sh
index a23e4098b..fe27942a1 100755
--- a/scripts/export_linux_config.sh
+++ b/scripts/export_linux_config.sh
@@ -33,4 +33,6 @@ echo "Using: $DIFFTOOL"
echo $DIFFTOOL $ARMADEUS_LINUX_DIR/defconfig $ARMADEUS_LINUX_CONFIG
$DIFFTOOL $ARMADEUS_LINUX_DIR/defconfig $ARMADEUS_LINUX_CONFIG
+echo "!! Don't forget to check if your BR configuration isn't using config fragments ;-) !!"
+
exit 0
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-02-24 08:47: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 83c25cc881d0c35b5bf74b2c5f2f5d6f391e6667 (commit)
via 30d9874bbbe5680797f020e8db1641e57b86444a (commit)
from 1e7376970e217d9fbb3ef86417facaf903ffe287 (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 83c25cc881d0c35b5bf74b2c5f2f5d6f391e6667
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 23 17:10:44 2023 +0100
[TOOLS] apf27_recovery.py: python3 support and cleanup
commit 30d9874bbbe5680797f020e8db1641e57b86444a
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 23 10:00:21 2023 +0100
[BUILDROOT] 2022.02: patches to fixed rt-tests downloading
* Bump rt-tests to version 2.5
-----------------------------------------------------------------------
Summary of changes:
...419-package-rt-tests-bump-version-to-2.5.patch} | 20 +-
software/uboot_recover/apf27_recover.py | 329 ++++++++-------------
2 files changed, 131 insertions(+), 218 deletions(-)
copy patches/buildroot/2022.02/{415-package-rt-tests-bump-version-to-2.4.patch => 419-package-rt-tests-bump-version-to-2.5.patch} (71%)
diff --git a/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch b/patches/buildroot/2022.02/419-package-rt-tests-bump-version-to-2.5.patch
similarity index 71%
copy from patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
copy to patches/buildroot/2022.02/419-package-rt-tests-bump-version-to-2.5.patch
index c7288580c..c1d980751 100644
--- a/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
+++ b/patches/buildroot/2022.02/419-package-rt-tests-bump-version-to-2.5.patch
@@ -1,8 +1,8 @@
-From d889bdc9b327203f75a31350f49b21e9da08b495 Mon Sep 17 00:00:00 2001
+From 14601da51ffe8556dee67ab2c05972569e03445f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
<seb...@ar...>
-Date: Mon, 18 Jul 2022 10:43:34 +0200
-Subject: [PATCH 1/1] package/rt-tests: bump version to 2.4
+Date: Thu, 23 Feb 2023 09:42:59 +0100
+Subject: [PATCH 1/1] package/rt-tests: bump version to 2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -14,28 +14,28 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash
-index 3adda60f42..49df8313f9 100644
+index 49df8313f9..eb28f4d441 100644
--- a/package/rt-tests/rt-tests.hash
+++ b/package/rt-tests/rt-tests.hash
@@ -1,4 +1,4 @@
# From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc
--sha256 b5e7959bcb5c703b2743030751af975ea4e04962e29fc1118f4b605987585735 rt-tests-2.3.tar.xz
-+sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz
+-sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz
++sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz
# locally computed hash
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
-index 056a4a6723..74290211ce 100644
+index 74290211ce..8ad4215ee1 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -6,7 +6,7 @@
RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
--RT_TESTS_VERSION = 2.3
-+RT_TESTS_VERSION = 2.4
+-RT_TESTS_VERSION = 2.4
++RT_TESTS_VERSION = 2.5
RT_TESTS_LICENSE = GPL-2.0+
RT_TESTS_LICENSE_FILES = COPYING
--
-2.35.1
+2.39.2
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index df05c6bfa..8020b2a48 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -1,7 +1,7 @@
#
# APF27 bootloader recovering tool
#
-# Copyright (C) 2008-2009 ARMadeus Systems
+# Copyright (C) 2008-2023 Armadeus Systems <su...@ar...>
#
# 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
@@ -20,16 +20,16 @@
# author: nic...@ar...
#
# Change History:
-# - (Jorasse) : init DDR RAM and u-boot upload
+# - (Sébastien Szymanski) : python3 support and cleanup
+# - (Jorasse) : init DDR RAM and u-boot upload
#
-import sys
-import time
-from struct import *
import os
-import serial
-import thread
import re
+import serial
+import sys
+import time
+
class Error(Exception):
""" Manage specific error
@@ -53,150 +53,95 @@ class Error(Exception):
self._message = message
message = property(_get_message, _set_message)
-
def __str__(self):
- print self.message
+ print(self.message)
def setLevel(self,level):
self.level = int(str(level))
def getLevel(self):
return self.level
+
class apf27Bootloader:
statuscode = { 0x8D: 'data specified is out of bounds',
0x55: 'error during assert verification',
- 0x36: 'hash verification failed',
- 0x33: 'certificate parsing failed or the certificate contained an unsupported key',
- 0x35: 'signature verification failed',
- 0x4B: 'CSF command sequence contains unsupported command identifier',
- 0x4E: 'absence of expected CSF header',
- 0x4D: 'CSF length is unsupported',
- 0x2E: 'CSF TYPE does not match processor TYPE',
- 0x2D: 'CSF UID does not match either processor UID or generic UID',
- 0x3A: 'CSF customer/product code does not match processor customer/product code',
- 0x87: 'key indexis either unsupported, or an attempt is made to overwrite the SRK from a CSF command',
- 0xF0: 'successful operation completion',
- 0x17: 'SCC unexpectedly not in secure state',
- 0x1E: 'secureRAM secret key invalid',
- 0x1D: 'secureRAM initialization failure',
- 0x1B: 'secureRAM self test failure',
- 0x2B: 'secureRAM internal failure',
- 0x27: 'secureRAM secrect key unexpectedly in use',
- 0x8B: 'an attempt is made to read a key from the list of subordinate public keys at a location where no key is installed',
- 0x8E: 'algorithm type is either invalid or ortherwise unsupported',
- 0x66: 'write operation to register failed',
- 0x63: 'DCD invalid',
- 0x6F: 'RAM application pointer is NULL or ERASED_FLASH',
- 0x69: 'CSF missing when HAB TYPE is not HAB-disabled',
- 0x6A: 'NANDFC boot buffer load failed',
- 0x6C: 'Exception has occured',
+ 0x36: 'hash verification failed',
+ 0x33: 'certificate parsing failed or the certificate contained an unsupported key',
+ 0x35: 'signature verification failed',
+ 0x4B: 'CSF command sequence contains unsupported command identifier',
+ 0x4E: 'absence of expected CSF header',
+ 0x4D: 'CSF length is unsupported',
+ 0x2E: 'CSF TYPE does not match processor TYPE',
+ 0x2D: 'CSF UID does not match either processor UID or generic UID',
+ 0x3A: 'CSF customer/product code does not match processor customer/product code',
+ 0x87: 'key indexis either unsupported, or an attempt is made to overwrite the SRK from a CSF command',
+ 0xF0: 'successful operation completion',
+ 0x17: 'SCC unexpectedly not in secure state',
+ 0x1E: 'secureRAM secret key invalid',
+ 0x1D: 'secureRAM initialization failure',
+ 0x1B: 'secureRAM self test failure',
+ 0x2B: 'secureRAM internal failure',
+ 0x27: 'secureRAM secrect key unexpectedly in use',
+ 0x8B: 'an attempt is made to read a key from the list of subordinate public keys at a location where no key is installed',
+ 0x8E: 'algorithm type is either invalid or ortherwise unsupported',
+ 0x66: 'write operation to register failed',
+ 0x63: 'DCD invalid',
+ 0x6F: 'RAM application pointer is NULL or ERASED_FLASH',
+ 0x69: 'CSF missing when HAB TYPE is not HAB-disabled',
+ 0x6A: 'NANDFC boot buffer load failed',
+ 0x6C: 'Exception has occured',
0x67: 'INT_BOOT fuse is blown but BOOT pins are set for external boot',
0x88: 'Successful download completion' }
-
-
- def __init__(self, serialport ):
+ def __init__(self, serialport):
self.port = serialport
-
def getstatus(self):
self.port.flushInput()
- #print 'get Status'
- self.port.write( self.buildcmd("0505" ,"00000000","b","00000000","00","0" ))
+ self.port.write(self.buildcmd(0x0505, 0, 0, 0, 0, 0))
result = self.port.read(4)
if len(result) > 0:
try:
- print self.statuscode[ord(result[0])]
- #for i in range(len(result)):
- # print '%02x' % ord(result[i]),
- except KeyError,e:
- print "Unknown status "+str(ord(result[0]))
+ print(self.statuscode[result[0]])
+ except KeyError as e:
+ print("Unknown status {}".format(result[0]))
else:
- print '\nread timeout'
+ print('\nread timeout')
def __displayProgress(self, text):
sys.stdout.write(chr(13))
- print text,
+ print(text, end=' ')
sys.stdout.flush()
-# addr: address to read
-# count: number of bytes to read
-# mode: b, w, l for byte, word, long
-
- def get( self, addr, count, mode ):
- assert len(addr) <= 8, 'address too long'
- assert int(count,16) > 0, 'zero length get'
- assert int(count,16) < 0xffffffff, 'Too long get, should be < 31 bytes'
- self.port.write( self.buildcmd("0101" ,addr,mode,count.zfill(9-len(count)),"00000000","0" ) )
-
- #nbbyte = 1
- #if mode == 'w':
- # nbbyte = 2
- #if mode == 'l':
- # nbbyte = 4
-
- #nbbyte = nbbyte * int(count)
- temp = self.port.read(int(count)+4) # read n+4 char
- if len(temp) == 0:
- print 'read timeout'
- return
- #print '\nread ACK:',
- #for i in range (len(temp)):
- # print '%02x' % ord(temp[i]),
-
- #print 'read data:',
- result = []
- for i in range (4,len(temp)):
-
- result += '%02x' % ord(temp[len(temp)-i+3]),
- #print ''.join(result)
- return ''.join(result)
-
-
# addr: address where the data have to be written
# data: data to write. must match the given mode
+# mode: 0x08, 0x10, 0x20 for byte, word, long
-# mode: b, w, l for byte, word, long
-
- def put( self, addr, data, mode ):
- assert len(data) > 0, 'zero length put'
- assert len(addr) == 8, 'address too long'
- self.port.write( self.buildcmd("0202" ,addr,mode,"00000000",data,"0" ))
- result = self.port.read(4) #ack
- if len(result) == 0:
- print 'read timeout'
+ def put(self, addr, data, mode):
+ self.port.write(self.buildcmd(0x0202, addr, mode, 0, data, 0))
+ result = self.port.read(4) # ack
+ if len(result) == 0:
+ print('read timeout')
return
- #print ' \nwrite ACK:',
- #for i in range (len(result)):
- # print '%02x' % ord(result[i]),
result = self.port.read(4)
if len(result) == 0:
- print 'read timeout'
- return
-
- #print '\nwrite success:',
- #for i in range (len(result)):
- #print '%02x' % ord(result[i]),
-
+ print('read timeout')
- def download( self, addr, data, size):
+ def download(self, addr, data, size):
assert size > 0, 'file empty'
f=open(data, 'rb')
- self.port.write( self.buildcmd("0404" ,addr,"l", size, "00000000","AA" ))
- result = self.port.read(4) #ack
- if len(result) == 0:
- print '\nread timeout'
+ self.port.write(self.buildcmd(0x0404, addr, 0, size, 0, 0xAA))
+ result = self.port.read(4) # ack
+ if len(result) == 0:
+ print('\nread timeout')
return
- #print ' \nwrite ACK:',
- #for i in range (len(result)):
- # print '%02x' % ord(result[i]),
data = f.read(16)
count = 16
b = 0
- print '\nTransfering:'
+ print('\nTransfering:')
while len(data):
n = len(data)
b = 16-n # ensure always 4 bytes
@@ -208,84 +153,58 @@ class apf27Bootloader:
data = f.read(16)
time.sleep(0.001)
self.__displayProgress("%d bytes transfered" % count)
- print ""
+ print("")
f.close()
self.getstatus()
- return
-
- def buildcmd( self, cmd, addr, ds, cnt, data, ft ):
- if ds == 'b':
- datatmp = ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int(data[0:2],16))
- datasize = "08"
- elif ds == 'w':
- datasize = "10"
- datatmp = ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int(data[0:2],16)) + ('%c' % int(data[2:4],16))
- elif ds == 'l':
- datasize = "20"
- datatmp = ('%c' % int(data[0:2],16)) + ('%c' % int(data[2:4],16)) + ('%c' % int(data[4:6],16)) + ('%c' % int(data[6:8],16))
- else:
- print "error invalid data size"
- return ""
-
- result = ('%c' % int(cmd[0:2],16)) + ('%c' % int(cmd[2:4],16)) + \
- ('%c' % int(addr[0:2],16)) + ('%c' % int(addr[2:4],16)) + ('%c' % int(addr[4:6],16)) + ('%c' % int(addr[6:8],16)) + \
- ('%c' % int(datasize,16)) + \
- ('%c' % int(cnt[0:2],16)) + ('%c' % int(cnt[2:4],16)) + ('%c' % int(cnt[4:6],16)) + ('%c' % int(cnt[6:8],16)) + \
- datatmp + ('%c' % int(ft,16))
- #for i in range(len(result)):
- # print '%02x' % ord(result[i]),
- #print cnt
- return result
+ def buildcmd(self, cmd, addr, ds, cnt, data, ft):
+ result = b''.join([cmd.to_bytes(2, 'big'), addr.to_bytes(4, 'big'),
+ ds.to_bytes(1, 'big'), cnt.to_bytes(4, 'big'),
+ data.to_bytes(4, 'big'), ft.to_bytes(1, 'big')])
+ return result
def initSDRAM2( self ):
- print "SDRAM INIT2 APF",
- self.put("D800100C","0069D42A","l")
-
- self.put("D8001008","92126485","l")
- self.put("B0000400","00000000","l")
- self.put("D8001008","A2126485","l")
- self.put("B0000000","00000000","l")
- self.put("B0000000","00000000","l")
- self.put("B0000000","00000000","l")
- self.put("B0000000","00000000","l")
- self.put("D8001008","B2126485","l")
- self.put("B0000033","DA0000DA","b")
- self.put("B2000000","00000000","b")
- self.put("D8001008","82126485","l")
+ print("SDRAM INIT2 APF", end=' ')
+ self.put(0xD800100C, 0x0069D42A, 0x20)
+
+ self.put(0xD8001008, 0x92126485, 0x20)
+ self.put(0xB0000400, 0x00000000, 0x20)
+ self.put(0xD8001008, 0xA2126485, 0x20)
+ self.put(0xB0000000, 0x00000000, 0x20)
+ self.put(0xB0000000, 0x00000000, 0x20)
+ self.put(0xB0000000, 0x00000000, 0x20)
+ self.put(0xB0000000, 0x00000000, 0x20)
+ self.put(0xD8001008, 0xB2126485, 0x20)
+ self.put(0xB0000033, 0xDA0000DA, 0x08)
+ self.put(0xB2000000, 0x00000000, 0x08)
+ self.put(0xD8001008, 0x82126485, 0x20)
def initSDRAM1( self ):
+ print("SDRAM INIT1 APF", end=' ')
+ self.put(0x10000000, 0x20040304, 0x20) #/* AIPI1_PSR0 */
+ self.put(0x10000004, 0xDFFBFCFB, 0x20) #/* AIPI1_PSR1 */
+ self.put(0x10020000, 0x00000000, 0x20) #/* AIPI2_PSR0 */
+ self.put(0x10020004, 0xFFFFFFFF, 0x20) #/* AIPI2_PSR1 */
+ self.put(0x10027818, 0x0003000F, 0x20) #/* GPCR */
- print "SDRAM INIT1 APF",
- self.put("10000000","20040304","l") #/* AIPI1_PSR0 */
- self.put("10000004","DFFBFCFB","l") #/* AIPI1_PSR1 */
- self.put("10020000","00000000","l") #/* AIPI2_PSR0 */
- self.put("10020004","FFFFFFFF","l") #/* AIPI2_PSR1 */
- self.put("10027818","0003000F","l") #/* GPCR */
-
- self.put("D8002060","00002200","l") #/* EIM / WCR */
-
- self.put("D8001010","0000002C","l")
+ self.put(0xD8002060, 0x00002200, 0x20) #/* EIM / WCR */
- self.put("D8001004","0069D42A","l")
+ self.put(0xD8001010, 0x0000002C, 0x20)
- self.put("D8001000","92126485","l")
- self.put("A0000400","00000000","l")
- self.put("D8001000","A2126485","l")
- self.put("A0000000","00000000","l")
- self.put("A0000000","00000000","l")
- self.put("A0000000","00000000","l")
- self.put("A0000000","00000000","l")
- self.put("D8001000","B2126485","l")
- self.put("A0000033","DA0000DA","b")
- self.put("A2000000","00000000","b")
- self.put("D8001000","82126485","l")
+ self.put(0xD8001004, 0x0069D42A, 0x20)
+ self.put(0xD8001000, 0x92126485, 0x20)
+ self.put(0xA0000400, 0x00000000, 0x20)
+ self.put(0xD8001000, 0xA2126485, 0x20)
+ self.put(0xA0000000, 0x00000000, 0x20)
+ self.put(0xA0000000, 0x00000000, 0x20)
+ self.put(0xA0000000, 0x00000000, 0x20)
+ self.put(0xA0000000, 0x00000000, 0x20)
+ self.put(0xD8001000, 0xB2126485, 0x20)
+ self.put(0xA0000033, 0xDA0000DA, 0x08)
+ self.put(0xA2000000, 0x00000000, 0x08)
+ self.put(0xD8001000, 0x82126485, 0x20)
- def consoleDump(tid):
- while 1:
- sys.stdout.write(tid.read(1))
- # print '%s' % tid.read(1),
class UBoot:
"""
@@ -297,52 +216,49 @@ class UBoot:
def __getOutput(self,error_msg=None):
""" This function waits for U-Boot response and return response"""
- #debugser = serial.Serial("/dev/tty0",115200,timeout=1)
response = ""
while not re.search(r'BIOS>',response):
char = self.serial.read(1)
if char == '':
raise Error(response)
- response = response + char
+ response = response + char.decode("ascii")
if error_msg!=None:
if re.search(error_msg,response):
raise Error("getOutput error")
- sys.stdout.write(char)
- #debugser.write(char)
- #debugser.close()
+ sys.stdout.write(char.decode("ascii"))
return response
def load(self):
if not os.path.exists(self.binary):
raise Error("file "+self.binary+" doesn't exit",0)
- self.fsize = "%08x" % os.path.getsize(self.binary) #os.stat(filesize)[6]
- self.bootstrap.download("A0000000", self.binary, self.fsize)
+ self.fsize = os.path.getsize(self.binary)
+ self.bootstrap.download(0xA0000000, self.binary, self.fsize)
def resetenv(self):
self.serial.flushInput()
- self.serial.write("env default -f && saveenv && echo Flash environment variables erased!\n")
+ self.serial.write("env default -f && saveenv && echo Flash environment variables erased!\n".encode("ascii"))
return self.__getOutput()
def waitForPrompt(self):
- self.serial.write("\003")
+ self.serial.write("\003".encode("ascii"))
while not self.serial.inWaiting():
time.sleep(0.001)
- self.serial.write("\003")
+ self.serial.write("\003".encode("ascii"))
return self.__getOutput()
def flash(self):
""" flash uboot """
self.serial.flushInput()
- self.serial.write("setenv fileaddr A0000000; setenv filesize "+self.fsize+";run flash_uboot\n")
+ self.serial.write("setenv fileaddr A0000000; setenv filesize {:08x};run flash_uboot\n".format(self.fsize).encode("ascii"))
try:
ret = self.__getOutput()
- except Error,e:
+ except Error as e:
raise Error("Flashing U-Boot")
- if not re.search(r'uboot succeed',ret):
- print ret
- raise Error("U-Boot flash failed",0)
+ if not re.search(r'uboot succeed', ret):
+ print(ret)
+ raise Error("U-Boot flash failed", 0)
return ret
-
+
if __name__ == "__main__":
@@ -353,27 +269,27 @@ if __name__ == "__main__":
UBOOT_RECOVERY_PATH = RECOVERY_URL+RECOVERY_VERSION+"/"+RECOVERY_BOARD_PATH+UBOOT_IMAGE_BIN+"/download"
if not os.path.exists(UBOOT_IMAGE_BIN):
try:
- print "Downloading " + UBOOT_IMAGE_BIN + ".."
+ print("Downloading " + UBOOT_IMAGE_BIN + "..")
os.system("wget -O "+ UBOOT_IMAGE_BIN + " " +UBOOT_RECOVERY_PATH)
- except Exception, msg:
- print "Failed to download U-Boot image file from server!"
- print msg
- print "Server may be unavailable for the momenet. please try later."
+ except Exception as msg:
+ print("Failed to download U-Boot image file from server!")
+ print(msg)
+ print("Server may be unavailable for the momenet. please try later.")
os.remove(UBOOT_IMAGE_BIN);
sys.exit()
SPEED = 115200
- print "\nAPF27 Bootstrap Tool\n"
- print "/!\\ Do not forget to put the bootstrap jumper and to reset your board /!\\"
- print "(be sure to have a file named apf27-u-boot-nand.bin in current dir too)\n"
+ print("\nAPF27 Bootstrap Tool\n")
+ print("/!\\ Do not forget to put the bootstrap jumper and to reset your board /!\\")
+ print("(be sure to have a file named apf27-u-boot-nand.bin in current dir too)\n")
print("/!\\ U-Boot recover eat lot of CPU, be sure that no process trust your CPU\n")
- port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows): ')
+ port = input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows): ')
try:
ser = serial.Serial(port, SPEED, timeout=3)
- except Exception, msg:
- print "unable to open serial port %s" % port
- print msg
+ except Exception as msg:
+ print("unable to open serial port %s" % port)
+ print(msg)
sys.exit()
ser.flush()
@@ -385,11 +301,8 @@ if __name__ == "__main__":
apfBootloader.initSDRAM2()
uboot.load()
uboot.waitForPrompt()
- eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
+ eraseAll = input('Would you like to erase the environment variables? y/n: ')
if eraseAll == 'y':
uboot.resetenv()
uboot.flash()
- print "U-Boot successfully recovered !"
-
- del ser
-
+ print("U-Boot successfully recovered !")
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-02-13 15:55:59
|
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 1e7376970e217d9fbb3ef86417facaf903ffe287 (commit)
via 766571ea2f2bc76b5ae907d221435e734cacc44f (commit)
via 3183fbf6b56e61d43ef65a9115155ea457367530 (commit)
via f23821a8a6eec4292083807b476b98a74336ce9d (commit)
from b8a8ef20f8c8ebf18eaa8801bac30519ac33fc80 (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 1e7376970e217d9fbb3ef86417facaf903ffe287
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 27 10:50:59 2023 +0100
[BUILDROOT] apf27_defconfig: add useful tools
commit 766571ea2f2bc76b5ae907d221435e734cacc44f
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 27 10:50:19 2023 +0100
[BUILDROOT] apf{27,51,6} / opos6ul{,nano,sp}: bump kernel to 5.10.167
commit 3183fbf6b56e61d43ef65a9115155ea457367530
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 27 10:20:16 2023 +0100
[LINUX] 5.10: apf27: update config to make the board boot again
commit f23821a8a6eec4292083807b476b98a74336ce9d
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 27 10:22:27 2023 +0100
[BUILDROOT] apf27_defconfig: fix path to linux patches dir
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 8 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
.../device/armadeus/apf27/apf27-linux-5.10.config | 313 +++++++++++++++------
7 files changed, 241 insertions(+), 90 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index a5ff0c628..b5cf9b2ea 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -24,8 +24,8 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
-BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_UIMAGE=y
@@ -55,6 +55,8 @@ BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_LIBGPIOD=y
+BR2_PACKAGE_LIBGPIOD_TOOLS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
@@ -69,6 +71,8 @@ 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_UTIL_LINUX=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 43724fc73..b25832c1d 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -26,7 +26,7 @@ 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="5.10.163"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index f7ff51cc3..9d60f423e 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -25,7 +25,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 8c01fcbff..eacf10bbc 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 84f20f60f..37e64153b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 12092521c..d4166ab52 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -24,7 +24,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="5.10.163"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.167"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-5.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-5.10.config
index 106237a72..4e61208a3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-5.10.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-5.10.config
@@ -4,25 +4,24 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CGROUPS=y
+CONFIG_BLK_DEV_INITRD=y
CONFIG_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
CONFIG_PROFILING=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX27=y
CONFIG_AEABI=y
-CONFIG_PM_DEBUG=y
-CONFIG_OPROFILE=m
+CONFIG_OPROFILE=y
+# CONFIG_GCC_PLUGINS is not set
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_MACH_IMX27_DT=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -30,29 +29,17 @@ CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
CONFIG_CAN=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_IMX_WEIM=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
@@ -63,115 +50,281 @@ CONFIG_MTD_CFI_GEOMETRY=y
# CONFIG_MTD_CFI_I2 is not set
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
+CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_AURORA is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
CONFIG_SMSC_PHY=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RTL8187=m
-CONFIG_RTL8192CU=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+# CONFIG_WLAN_VENDOR_ATH is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+# CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
+# CONFIG_WLAN_VENDOR_INTEL is not set
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_MICROCHIP is not set
+# CONFIG_WLAN_VENDOR_RALINK is not set
+# CONFIG_WLAN_VENDOR_REALTEK is not set
+# CONFIG_WLAN_VENDOR_RSI is not set
+# CONFIG_WLAN_VENDOR_ST is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
+# CONFIG_WLAN_VENDOR_QUANTENNA is not set
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=m
+CONFIG_KEYBOARD_IMX=y
# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2102=y
# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_8250=m
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_SMBUS=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_AGGREGATOR=y
CONFIG_W1=y
CONFIG_W1_MASTER_MXC=y
CONFIG_W1_SLAVE_THERM=y
+CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_IMX2_WDT=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_PWC=m
+# CONFIG_USB_GSPCA is not set
CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=m
-CONFIG_VIDEO_MX2=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=m
-CONFIG_VIDEO_MX2_EMMAPRP=m
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-CONFIG_SOC_CAMERA_MT9M111=m
+# CONFIG_CXD2880_SPI_DRV is not set
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA18250 is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MSI001 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2063 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_FC0011 is not set
+# CONFIG_MEDIA_TUNER_FC0012 is not set
+# CONFIG_MEDIA_TUNER_FC0013 is not set
+# CONFIG_MEDIA_TUNER_TDA18212 is not set
+# CONFIG_MEDIA_TUNER_E4000 is not set
+# CONFIG_MEDIA_TUNER_FC2580 is not set
+# CONFIG_MEDIA_TUNER_M88RS6000T is not set
+# CONFIG_MEDIA_TUNER_TUA9001 is not set
+# CONFIG_MEDIA_TUNER_SI2157 is not set
+# CONFIG_MEDIA_TUNER_IT913X is not set
+# CONFIG_MEDIA_TUNER_R820T is not set
+# CONFIG_MEDIA_TUNER_MXL301RF is not set
+# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
+# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# CONFIG_DVB_STB0899 is not set
+# CONFIG_DVB_STB6100 is not set
+# CONFIG_DVB_STV090x is not set
+# CONFIG_DVB_STV0910 is not set
+# CONFIG_DVB_STV6110x is not set
+# CONFIG_DVB_STV6111 is not set
+# CONFIG_DVB_MXL5XX is not set
+# CONFIG_DVB_DRXK is not set
+# CONFIG_DVB_TDA18271C2DD is not set
+# CONFIG_DVB_SI2165 is not set
+# CONFIG_DVB_MN88472 is not set
+# CONFIG_DVB_MN88473 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_ZL10036 is not set
+# CONFIG_DVB_ZL10039 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_STV0288 is not set
+# CONFIG_DVB_STB6000 is not set
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_STV6110 is not set
+# CONFIG_DVB_STV0900 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_TDA10086 is not set
+# CONFIG_DVB_TDA8261 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_TUNER_ITD1000 is not set
+# CONFIG_DVB_TUNER_CX24113 is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TUA6100 is not set
+# CONFIG_DVB_CX24116 is not set
+# CONFIG_DVB_CX24117 is not set
+# CONFIG_DVB_CX24120 is not set
+# CONFIG_DVB_SI21XX is not set
+# CONFIG_DVB_TS2020 is not set
+# CONFIG_DVB_DS3000 is not set
+# CONFIG_DVB_MB86A16 is not set
+# CONFIG_DVB_TDA10071 is not set
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_S5H1432 is not set
+# CONFIG_DVB_DRXD is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+# CONFIG_DVB_DIB9000 is not set
+# CONFIG_DVB_TDA10048 is not set
+# CONFIG_DVB_EC100 is not set
+# CONFIG_DVB_STV0367 is not set
+# CONFIG_DVB_CXD2820R is not set
+# CONFIG_DVB_CXD2841ER is not set
+# CONFIG_DVB_ZD1301_DEMOD is not set
+# CONFIG_DVB_CXD2880 is not set
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
+# CONFIG_DVB_LGDT3305 is not set
+# CONFIG_DVB_LG2160 is not set
+# CONFIG_DVB_S5H1409 is not set
+# CONFIG_DVB_AU8522_DTV is not set
# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_S5H1411 is not set
+# CONFIG_DVB_S921 is not set
+# CONFIG_DVB_DIB8000 is not set
+# CONFIG_DVB_MB86A20S is not set
+# CONFIG_DVB_TC90522 is not set
+# CONFIG_DVB_MN88443X is not set
+# CONFIG_DVB_PLL is not set
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_DVB_DRX39XYJ is not set
+# CONFIG_DVB_LNBH25 is not set
+# CONFIG_DVB_LNBH29 is not set
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_LNBP22 is not set
+# CONFIG_DVB_ISL6405 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_ISL6423 is not set
+# CONFIG_DVB_A8293 is not set
+# CONFIG_DVB_LGS8GL5 is not set
+# CONFIG_DVB_LGS8GXX is not set
+# CONFIG_DVB_ATBM8830 is not set
+# CONFIG_DVB_TDA665x is not set
+# CONFIG_DVB_IX2505V is not set
+# CONFIG_DVB_M88RS2000 is not set
+# CONFIG_DVB_AF9033 is not set
+# CONFIG_DVB_HORUS3A is not set
+# CONFIG_DVB_ASCOT2E is not set
+# CONFIG_DVB_HELENE is not set
+# CONFIG_DVB_CXD2099 is not set
+# CONFIG_DVB_SP2 is not set
CONFIG_FB=y
CONFIG_FB_IMX=y
-CONFIG_LCD_L4F00242T03=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_BACKLIGHT_GPIO=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
# CONFIG_SND_ARM is not set
# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_IMX_AUDMUX=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
+# CONFIG_USB_CHIPIDEA_TEGRA is not set
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
-CONFIG_USB_FSL_USB2=y
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
@@ -186,50 +339,44 @@ CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_LEDS_TRIGGER_TRANSIENT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1374=y
-CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC=y
CONFIG_DMADEVICES=y
CONFIG_IMX_DMA=y
-CONFIG_IMX_SDMA=y
+# CONFIG_MX3_IPU is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=y
CONFIG_MAX1027=y
+CONFIG_MAX5821=y
CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_PWM_IMX27=y
CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
# CONFIG_DNOTIFY is not set
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_850=m
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-01-18 12:50: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 b8a8ef20f8c8ebf18eaa8801bac30519ac33fc80 (commit)
from 04a8fed3bd44a910fc7b82237c8ff769fd48b149 (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 b8a8ef20f8c8ebf18eaa8801bac30519ac33fc80
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jan 18 13:46:32 2023 +0100
[BUILDROOT] Bump BR to 2022.02.9
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3373c6dee..c312121b5 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 8
+BUILDROOT_MINOR_VERSION ?= 9
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-01-17 15:43:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 04a8fed3bd44a910fc7b82237c8ff769fd48b149 (commit)
from 57783c8bfc78491f32a645c95c83015be4dbc91d (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 04a8fed3bd44a910fc7b82237c8ff769fd48b149
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 17 16:39:23 2023 +0100
[BUILDROOT] apf27_defconfig: fix path to linux .config file
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 94f332dfe..a5ff0c628 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -27,7 +27,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../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_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-01-17 13:09:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 57783c8bfc78491f32a645c95c83015be4dbc91d (commit)
via b70d02c21c192c925bd29e4f8d552b98de56bd31 (commit)
via d88a65184b1ce69905df2a5e00725859b9b5ac9a (commit)
from 3e5ccd4ffc6c8b26710858a65a867d8f031b874b (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 57783c8bfc78491f32a645c95c83015be4dbc91d
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 17 12:03:43 2023 +0100
[BUILDROOT] apf6_defconfig: add useful tools and firmwares
commit b70d02c21c192c925bd29e4f8d552b98de56bd31
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 17 12:02:46 2023 +0100
[BUILDROOT] apf{27,51,6} / opos6ul{,nano,sp}: bump kernel to 5.10.163
commit d88a65184b1ce69905df2a5e00725859b9b5ac9a
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 16 14:25:17 2023 +0100
[LINUX] 5.10: apf6: fix patch 0701
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 18 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
.../apf6-linux-5.10.config} | 343 ++++++++-------------
.../linux/5.10/0701-armadeus-pcie_init_crash.patch | 20 +-
8 files changed, 159 insertions(+), 232 deletions(-)
copy buildroot/target/device/armadeus/{opos6ul/opos6ul-linux-5.10.config => apf6/apf6-linux-5.10.config} (68%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index e1ad9bf4b..94f332dfe 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -24,7 +24,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.60"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index c813a983f..43724fc73 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -26,7 +26,7 @@ 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="5.10.162"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index aa126d165..f7ff51cc3 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -7,7 +7,6 @@ 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_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -26,14 +25,17 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.227"
-BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev imx6q-apf6v2dev imx6dl-apf6v2dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
+BR2_PACKAGE_LINUX_TOOLS_IIO=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_DEMOS=y
@@ -112,18 +114,24 @@ BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
+BR2_PACKAGE_FIRMWARE_IMX=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_LEPTONMODULE=y
BR2_PACKAGE_LINUXCONSOLETOOLS=y
BR2_PACKAGE_PCI_DEBUG=y
-BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBDRM=y
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_LIBGPIOD=y
+BR2_PACKAGE_LIBGPIOD_TOOLS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index ab9323064..8c01fcbff 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 1dd2d3727..84f20f60f 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 3b25fe2ea..12092521c 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -24,7 +24,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="5.10.162"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.163"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config b/buildroot/target/device/armadeus/apf6/apf6-linux-5.10.config
similarity index 68%
copy from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-5.10.config
index f7b6610f4..725231319 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-5.10.config
@@ -1,9 +1,8 @@
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+CONFIG_PREEMPT=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_RELAY=y
@@ -15,28 +14,26 @@ CONFIG_PERF_EVENTS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MXC=y
-CONFIG_SOC_IMX6UL=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_775420=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_ARM_PSCI=y
-CONFIG_HIGHMEM=y
-CONFIG_FORCE_MAX_ZONEORDER=14
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_KEXEC=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_SMP=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPUFREQ_DT=y
CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_ARM_IMX_CPUFREQ_DT=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_SECCOMP is not set
# CONFIG_GCC_PLUGINS is not set
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
@@ -44,7 +41,6 @@ CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_BINFMT_MISC=m
-CONFIG_CMA=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -52,17 +48,36 @@ CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_NETFILTER=y
-CONFIG_CAN=y
-CONFIG_CAN_FLEXCAN=y
-CONFIG_BT=y
+CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_CFG80211=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_DEBUG=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_PCI_IMX6=y
+CONFIG_UEVENT_HELPER=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
@@ -70,46 +85,46 @@ CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_MTD_UBI_BLOCK=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
+CONFIG_PATA_IMX=y
CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
# CONFIG_NET_VENDOR_AURORA is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
# CONFIG_NET_VENDOR_CADENCE is not set
# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CISCO is not set
# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_GOOGLE is not set
@@ -121,31 +136,48 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROCHIP is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MYRI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
# CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
# CONFIG_NET_VENDOR_RENESAS is not set
# CONFIG_NET_VENDOR_ROCKER is not set
# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
# CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set
# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_MICREL_PHY=y
-CONFIG_MICROCHIP_PHY=y
CONFIG_AT803X_PHY=y
+CONFIG_PPP=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
CONFIG_USB_USBNET=y
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_NET_MCS7830=y
-CONFIG_USB_NET_RNDIS_HOST=y
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_NET_CDC_MBIM=y
+# CONFIG_USB_NET_NET1080 is not set
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_WLAN_VENDOR_ADMTEK is not set
@@ -162,7 +194,9 @@ CONFIG_BRCMFMAC=m
# CONFIG_WLAN_VENDOR_REALTEK is not set
# CONFIG_WLAN_VENDOR_RSI is not set
# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
+CONFIG_WL12XX=m
+CONFIG_WLCORE_SDIO=m
+# CONFIG_WILINK_PLATFORM_DATA is not set
# CONFIG_WLAN_VENDOR_ZYDAS is not set
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
CONFIG_INPUT_EVDEV=y
@@ -171,103 +205,47 @@ CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_TOUCHSCREEN_AD7879=y
-CONFIG_TOUCHSCREEN_AD7879_I2C=y
-CONFIG_TOUCHSCREEN_ATMEL_MXT=y
-CONFIG_TOUCHSCREEN_DA9052=y
-CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_GOODIX=y
-CONFIG_TOUCHSCREEN_ILI210X=y
-CONFIG_TOUCHSCREEN_MAX11801=y
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
-CONFIG_TOUCHSCREEN_EDT_FT5X06=y
-CONFIG_TOUCHSCREEN_MC13783=y
-CONFIG_TOUCHSCREEN_TSC2004=y
-CONFIG_TOUCHSCREEN_TSC2007=y
-CONFIG_TOUCHSCREEN_STMPE=y
CONFIG_TOUCHSCREEN_SX8654=y
-CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
+# CONFIG_HW_RANDOM is not set
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_GPIO=y
# CONFIG_I2C_HELPER_AUTO is not set
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
-CONFIG_SPI_FSL_QUADSPI=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=y
-CONFIG_PINCTRL_IMX8MM=y
-CONFIG_PINCTRL_IMX8MN=y
-CONFIG_PINCTRL_IMX8MP=y
-CONFIG_PINCTRL_IMX8MQ=y
+CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MXC=y
-CONFIG_GPIO_MAX732X=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_STMPE=y
-CONFIG_GPIO_74X164=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_SENSORS_MC13783_ADC=y
-CONFIG_SENSORS_GPIO_FAN=y
-CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_THERMAL=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
+# CONFIG_HWMON is not set
+CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y
CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_IMX2_WDT=y
-CONFIG_IMX7ULP_WDT=y
-CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_DA9062=y
-CONFIG_MFD_DA9063=y
-CONFIG_MFD_MC13XXX_SPI=y
-CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_MFD_RN5T618=y
-CONFIG_MFD_STMPE=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_DA9052=y
-CONFIG_REGULATOR_DA9062=y
-CONFIG_REGULATOR_DA9063=y
CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_MC13783=y
-CONFIG_REGULATOR_MC13892=y
-CONFIG_REGULATOR_PFUZE100=y
-CONFIG_REGULATOR_RN5T618=y
-CONFIG_RC_CORE=y
-CONFIG_RC_DEVICES=y
-CONFIG_IR_GPIO_CIR=y
# CONFIG_MEDIA_CEC_SUPPORT is not set
CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_RADIO_ADAPTERS is not set
CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MUX=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_IMX_PXP=y
+CONFIG_VIDEO_CODA=m
CONFIG_VIDEO_OV5640=m
# CONFIG_CXD2880_SPI_DRV is not set
# CONFIG_MEDIA_TUNER_SIMPLE is not set
@@ -314,7 +292,6 @@ CONFIG_VIDEO_OV5640=m
# CONFIG_DVB_STV6110x is not set
# CONFIG_DVB_STV6111 is not set
# CONFIG_DVB_MXL5XX is not set
-# CONFIG_DVB_M88DS3103 is not set
# CONFIG_DVB_DRXK is not set
# CONFIG_DVB_TDA18271C2DD is not set
# CONFIG_DVB_SI2165 is not set
@@ -364,15 +341,10 @@ CONFIG_VIDEO_OV5640=m
# CONFIG_DVB_DIB7000P is not set
# CONFIG_DVB_DIB9000 is not set
# CONFIG_DVB_TDA10048 is not set
-# CONFIG_DVB_AF9013 is not set
# CONFIG_DVB_EC100 is not set
# CONFIG_DVB_STV0367 is not set
# CONFIG_DVB_CXD2820R is not set
# CONFIG_DVB_CXD2841ER is not set
-# CONFIG_DVB_RTL2830 is not set
-# CONFIG_DVB_RTL2832 is not set
-# CONFIG_DVB_RTL2832_SDR is not set
-# CONFIG_DVB_SI2168 is not set
# CONFIG_DVB_ZD1301_DEMOD is not set
# CONFIG_DVB_CXD2880 is not set
# CONFIG_DVB_VES1820 is not set
@@ -385,7 +357,6 @@ CONFIG_VIDEO_OV5640=m
# CONFIG_DVB_BCM3510 is not set
# CONFIG_DVB_LGDT330X is not set
# CONFIG_DVB_LGDT3305 is not set
-# CONFIG_DVB_LGDT3306A is not set
# CONFIG_DVB_LG2160 is not set
# CONFIG_DVB_S5H1409 is not set
# CONFIG_DVB_AU8522_DTV is not set
@@ -420,83 +391,55 @@ CONFIG_VIDEO_OV5640=m
# CONFIG_DVB_HELENE is not set
# CONFIG_DVB_CXD2099 is not set
# CONFIG_DVB_SP2 is not set
+# CONFIG_VGA_ARB is not set
CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_HDMI=y
-CONFIG_DRM_MXSFB=y
+CONFIG_DRM_ETNAVIV=y
CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_MX3 is not set
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_BACKLIGHT_GPIO=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=y
CONFIG_SND=y
-CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_PCI is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_ES8328=y
CONFIG_SND_SOC_IMX_SGTL5000=y
CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
-CONFIG_SND_SOC_FSL_ASOC_CARD=y
-CONFIG_SND_SOC_AC97_CODEC=y
-CONFIG_SND_SOC_CS42XX8_I2C=y
-CONFIG_SND_SOC_TLV320AIC3X=y
-CONFIG_SND_SOC_WM8960=y
-CONFIG_SND_SOC_WM8962=y
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_AUDIO_GRAPH_CARD=y
CONFIG_HID_MULTITOUCH=y
CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=m
+CONFIG_USB_ACM=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_TEST=m
-CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
-CONFIG_USB_FSL_USB2=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_AUDIO=m
CONFIG_USB_ETH=m
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
CONFIG_MMC=y
@@ -506,59 +449,31 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_ISL1208=y
-CONFIG_RTC_DRV_PCF8523=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_RTC_DRV_M41T80=y
-CONFIG_RTC_DRV_RC5T619=y
-CONFIG_RTC_DRV_DA9063=y
-CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_MXC=y
-CONFIG_RTC_DRV_MXC_V2=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
-CONFIG_FSL_EDMA=y
CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
-CONFIG_DMATEST=m
+CONFIG_UIO=y
+CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_UIO_DMEM_GENIRQ=y
CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_IMX_MEDIA=y
-CONFIG_VIDEO_IMX_CSI=m
-CONFIG_VIDEO_IMX7_CSI=m
-CONFIG_COMMON_CLK_PWM=y
-CONFIG_CLK_IMX8MM=y
-CONFIG_CLK_IMX8MN=y
-CONFIG_CLK_IMX8MP=y
-CONFIG_CLK_IMX8MQ=y
-CONFIG_IMX_GPCV2_PM_DOMAINS=y
-CONFIG_SOC_IMX8M=y
-CONFIG_IIO=y
-CONFIG_MMA8452=y
-CONFIG_IMX7D_ADC=y
-CONFIG_RN5T618_ADC=y
-CONFIG_VF610_ADC=y
-CONFIG_SENSORS_ISL29018=y
-CONFIG_MAG3110=y
-CONFIG_MPL3115=y
+# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
-CONFIG_PWM_FSL_FTM=y
CONFIG_PWM_IMX27=y
-CONFIG_PWM_IMX_TPM=y
+CONFIG_NVMEM_IMX_IIM=y
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_SNVS_LPGPR=y
-CONFIG_MUX_MMIO=y
+CONFIG_FPGA=y
+CONFIG_FPGA_MGR_ALTERA_CVP=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -566,46 +481,39 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
+CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_MSDOS_FS=m
+CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
+# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_2=y
CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
CONFIG_SECURITYFS=y
CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
-CONFIG_CRYPTO_DEV_SAHARA=y
-CONFIG_CRYPTO_DEV_MXS_DCP=y
-CONFIG_CRC_CCITT=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_HW is not set
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=64
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
@@ -615,4 +523,5 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
CONFIG_STACKTRACE=y
+# CONFIG_RCU_TRACE is not set
# CONFIG_FTRACE is not set
diff --git a/patches/linux/5.10/0701-armadeus-pcie_init_crash.patch b/patches/linux/5.10/0701-armadeus-pcie_init_crash.patch
index 9093df81c..a063fcbb8 100644
--- a/patches/linux/5.10/0701-armadeus-pcie_init_crash.patch
+++ b/patches/linux/5.10/0701-armadeus-pcie_init_crash.patch
@@ -1,8 +1,18 @@
-Index: linux-4.19.10/drivers/pci/controller/dwc/pci-imx6.c
+Index: linux-5.10.163/drivers/pci/controller/dwc/pci-imx6.c
===================================================================
---- linux-4.19.10.orig/drivers/pci/controller/dwc/pci-imx6.c
-+++ linux-4.19.10/drivers/pci/controller/dwc/pci-imx6.c
-@@ -282,6 +282,32 @@ static int imx6q_pcie_abort_handler(unsi
+--- linux-5.10.163.orig/drivers/pci/controller/dwc/pci-imx6.c
++++ linux-5.10.163/drivers/pci/controller/dwc/pci-imx6.c
+@@ -95,6 +95,9 @@ struct imx6_pcie {
+
+ /* PCIe Port Logic registers (memory-mapped) */
+ #define PL_OFFSET 0x700
++#define PCIE_PL_PFLR (PL_OFFSET + 0x08)
++#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16)
++#define PCIE_PL_PFLR_FORCE_LINK (1 << 15)
+
+ #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
+ #define PCIE_PHY_CTRL_DATA(x) FIELD_PREP(GENMASK(15, 0), (x))
+@@ -365,6 +368,32 @@ static int imx6_pcie_attach_pd(struct de
static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
{
struct device *dev = imx6_pcie->pci->dev;
@@ -33,5 +43,5 @@ Index: linux-4.19.10/drivers/pci/controller/dwc/pci-imx6.c
+ IMX6Q_GPR12_PCIE_CTL_2, 0 << 10);
+ }
- switch (imx6_pcie->variant) {
+ switch (imx6_pcie->drvdata->variant) {
case IMX7D:
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-01-12 18:21:32
|
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 3e5ccd4ffc6c8b26710858a65a867d8f031b874b (commit)
via 8dd71146f0bf6c82593b2efe81a81efc426b18e3 (commit)
via c3e12ffb5c80f7483b92d915e7c22cea1db78ca2 (commit)
from 7facb5263a494c4975abb8d6ec9eb4725a53e9a2 (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 3e5ccd4ffc6c8b26710858a65a867d8f031b874b
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 12 19:14:02 2023 +0100
[LINUX] 5.10: Set connector type for Armadeus ST0700 Adapt panel
commit 8dd71146f0bf6c82593b2efe81a81efc426b18e3
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 12 19:11:50 2023 +0100
[LINUX] opos6ul: 5.10: disable CONFIG_PROVE_LOCKING and CONFIG_RCU_TRACE
commit c3e12ffb5c80f7483b92d915e7c22cea1db78ca2
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 12 18:19:27 2023 +0100
[BUILDROOT] opos6ul{,nano,sp}: bump kernel to 5.10.162
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 6 ++--
buildroot/configs/opos6ulsp_defconfig | 6 ++--
.../armadeus/opos6ul/opos6ul-linux-5.10.config | 4 +--
.../opos6ulnano/opos6ulnano-linux-5.10.config | 1 +
.../armadeus/opos6ulsp/opos6ulsp-linux-5.10.config | 1 +
...dts-opos6ulspdev-properly-mux-tampers-pin.patch | 0
...et-connector-type-for-Armadeus-ST0700-Ada.patch | 33 ++++++++++++++++++++
...0819-ARM-dts-opos6ulsp-set-pwm-cells-to-2.patch | 36 ++++++++++++++++++++++
9 files changed, 80 insertions(+), 9 deletions(-)
create mode 120000 buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-5.10.config
create mode 120000 buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.10.config
copy patches/linux/{4.19 => 5.10}/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch (100%)
create mode 100644 patches/linux/5.10/0818-drm-panel-Set-connector-type-for-Armadeus-ST0700-Ada.patch
create mode 100644 patches/linux/5.10/0819-ARM-dts-opos6ulsp-set-pwm-cells-to-2.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 7ef6f9547..ab9323064 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 815bc35e5..1dd2d3727 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -23,10 +23,10 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.227"
-BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulnanodev imx6ull-opos6ulnanodev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 9d704813f..3b25fe2ea 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -24,10 +24,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.19.227"
-BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
+BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulspdev imx6ull-opos6ulspdev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config
index 17d30e979..f7b6610f4 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-5.10.config
@@ -9,6 +9,7 @@ CONFIG_CGROUPS=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
CONFIG_PERF_EVENTS=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
@@ -613,6 +614,5 @@ CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
-CONFIG_RCU_TRACE=y
+CONFIG_STACKTRACE=y
# CONFIG_FTRACE is not set
diff --git a/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-5.10.config b/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-5.10.config
new file mode 120000
index 000000000..98fc71fe5
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ulnano/opos6ulnano-linux-5.10.config
@@ -0,0 +1 @@
+../opos6ul/opos6ul-linux-5.10.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.10.config b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.10.config
new file mode 120000
index 000000000..98fc71fe5
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ulsp/opos6ulsp-linux-5.10.config
@@ -0,0 +1 @@
+../opos6ul/opos6ul-linux-5.10.config
\ No newline at end of file
diff --git a/patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch b/patches/linux/5.10/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
similarity index 100%
copy from patches/linux/4.19/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
copy to patches/linux/5.10/0807-armadeus-dts-opos6ulspdev-properly-mux-tampers-pin.patch
diff --git a/patches/linux/5.10/0818-drm-panel-Set-connector-type-for-Armadeus-ST0700-Ada.patch b/patches/linux/5.10/0818-drm-panel-Set-connector-type-for-Armadeus-ST0700-Ada.patch
new file mode 100644
index 000000000..14d126c6a
--- /dev/null
+++ b/patches/linux/5.10/0818-drm-panel-Set-connector-type-for-Armadeus-ST0700-Ada.patch
@@ -0,0 +1,33 @@
+From 4f6aea2b9e5036924d2d52a352ccd8acf246aa63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 12 Jan 2023 15:31:11 +0100
+Subject: [PATCH 1/1] drm: panel: Set connector type for Armadeus ST0700 Adapt
+ panel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Armadeus ST0700 Adapt is a DPI panel, set the connector type
+accordingly.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/gpu/drm/panel/panel-simple.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
+index 8a3b685c2fcc..22c579d79d01 100644
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -843,6 +843,7 @@ static const struct panel_desc armadeus_st0700_adapt = {
+ },
+ .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
+ .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE,
++ .connector_type = DRM_MODE_CONNECTOR_DPI,
+ };
+
+ static const struct drm_display_mode auo_b101aw03_mode = {
+--
+2.38.2
+
diff --git a/patches/linux/5.10/0819-ARM-dts-opos6ulsp-set-pwm-cells-to-2.patch b/patches/linux/5.10/0819-ARM-dts-opos6ulsp-set-pwm-cells-to-2.patch
new file mode 100644
index 000000000..5a0ae7634
--- /dev/null
+++ b/patches/linux/5.10/0819-ARM-dts-opos6ulsp-set-pwm-cells-to-2.patch
@@ -0,0 +1,36 @@
+From 30a768c4e2e5012b5cd7ca7b58d7346806174ce1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 12 Jan 2023 17:45:51 +0100
+Subject: [PATCH 819/819] ARM: dts: opos6ulsp: set #pwm-cells to 2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+index 720708f66484..892954cf9798 100644
+--- a/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
++++ b/arch/arm/boot/dts/imx6ul-imx6ull-opos6ulspdev.dtsi
+@@ -146,12 +146,14 @@ LQ043 {
+ };
+
+ &pwm6 {
++ #pwm-cells = <2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm6>;
+ status = "okay";
+ };
+
+ &pwm7 {
++ #pwm-cells = <2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm7>;
+ status = "okay";
+--
+2.38.2
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2023-01-05 20:26: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 7facb5263a494c4975abb8d6ec9eb4725a53e9a2 (commit)
via 55b0cbfd0c0c5b91a98e60c4bd036d71434d017f (commit)
from f4c1bb4e294742f64341886758f50f27d881fcc5 (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 7facb5263a494c4975abb8d6ec9eb4725a53e9a2
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 5 21:20:15 2023 +0100
[BUILDROOT] apf51: bump linux to 5.10.162 and add APF51v2 support
commit 55b0cbfd0c0c5b91a98e60c4bd036d71434d017f
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 5 11:04:49 2023 +0100
[LINUX] apf51: 5.10: enable GPIOs driver
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 6 +-
.../device/armadeus/apf51/apf51-linux-5.10.config | 10 +-
...1-apf51dev-rework-device-tree-to-support.patch} | 1057 +++++++++-----------
...f51dev-add-pinctrl-properties-to-gpio-key.patch | 58 ++
...f51dev-add-pinctrl-properties-to-gpio-led.patch | 52 +
5 files changed, 600 insertions(+), 583 deletions(-)
copy patches/linux/{4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch => 5.10/0815-ARM-dts-apf51-apf51dev-rework-device-tree-to-support.patch} (61%)
create mode 100644 patches/linux/5.10/0816-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-key.patch
create mode 100644 patches/linux/5.10/0817-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-led.patch
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index ab082189e..c813a983f 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -26,14 +26,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="5.10.60"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.162"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/5.10"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-5.10.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_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev imx51-apf51v2dev"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-5.10.config b/buildroot/target/device/armadeus/apf51/apf51-linux-5.10.config
index fdfff6a35..8de2da697 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-5.10.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-5.10.config
@@ -100,12 +100,12 @@ CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MXC=y
CONFIG_GPIO_WM831X=m
CONFIG_POWER_SUPPLY=y
CONFIG_WM831X_BACKUP=m
CONFIG_WM831X_POWER=m
-CONFIG_HWMON=m
-CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_MC13783_ADC=y
CONFIG_SENSORS_WM831X=m
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
@@ -115,7 +115,7 @@ CONFIG_MFD_MC13XXX_I2C=y
CONFIG_MFD_WM831X_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MC13892=y
CONFIG_MEDIA_SUPPORT=m
# CONFIG_RADIO_ADAPTERS is not set
# CONFIG_MEDIA_TUNER_SIMPLE is not set
@@ -188,12 +188,12 @@ CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_MC13783=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_WM831X=y
-CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MC13XXX=y
CONFIG_STAGING=y
CONFIG_IIO=m
CONFIG_EXT2_FS=y
diff --git a/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/5.10/0815-ARM-dts-apf51-apf51dev-rework-device-tree-to-support.patch
similarity index 61%
copy from patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
copy to patches/linux/5.10/0815-ARM-dts-apf51-apf51dev-rework-device-tree-to-support.patch
index 22df1f01c..6d1f00730 100644
--- a/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/5.10/0815-ARM-dts-apf51-apf51dev-rework-device-tree-to-support.patch
@@ -1,262 +1,92 @@
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
-===================================================================
---- /dev/null
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
-@@ -0,0 +1,182 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ * Copyright 2012 Laurent Cans <lau...@gm...>
-+ *
-+ * Based on mx51-babbage.dts
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+#include "imx51.dtsi"
-+
-+/ {
-+ memory {
-+ reg = <0x90000000 0x20000000>;
-+ };
-+
-+ clocks {
-+ osc {
-+ clock-frequency = <33554432>;
-+ };
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+
-+ reg_usbotg_vbus: usbotg_vbus {
-+ compatible = "regulator-fixed";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotgreg>;
-+ regulator-name = "usbotg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-+ enable-active-high;
-+ };
-+ };
-+};
-+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_fec>;
-+ phy-mode = "mii";
-+ phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
-+ phy-reset-duration = <1>;
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2>;
-+ clock-frequency = <400000>;
-+ status = "okay";
-+};
-+
-+&nfc {
-+ nand-bus-width = <8>;
-+ nand-ecc-mode = "hw";
-+ nand-on-flash-bbt;
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-+
-+&usbphy1 {
-+ reset-gpios = <&gpio3 1 GPIO_ACTIVE_LOW>;
-+};
-+
-+&usbh1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh1>;
-+ phy_type = "ulpi";
-+ dr_mode = "host";
-+ ext-clk-en;
-+ status = "okay";
-+};
-+
-+&usbh2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh2>;
-+ phy_type = "ulpi";
-+ dr_mode = "host";
-+ ext-clk-en;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ phy_type = "utmi_wide";
-+ vbus-supply = <®_usbotg_vbus>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ imx51-apf51 {
-+ pinctrl_fec: fecgrp {
-+ fsl,pins = <
-+ MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
-+ MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
-+ MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
-+ MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
-+ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
-+ MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
-+ MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
-+ MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
-+ MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
-+ MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
-+ MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
-+ MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
-+ MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
-+ MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
-+ MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_i2c2: i2c2grp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
-+ MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
-+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_usbh1: usbh1grp {
-+ fsl,pins = <
-+ MX51_PAD_USBH1_DATA0__USBH1_DATA0 0x1e5
-+ MX51_PAD_USBH1_DATA1__USBH1_DATA1 0x1e5
-+ MX51_PAD_USBH1_DATA2__USBH1_DATA2 0x1e5
-+ MX51_PAD_USBH1_DATA3__USBH1_DATA3 0x1e5
-+ MX51_PAD_USBH1_DATA4__USBH1_DATA4 0x1e5
-+ MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x1e5
-+ MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x1e5
-+ MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x1e5
-+ MX51_PAD_USBH1_CLK__USBH1_CLK 0x1e5
-+ MX51_PAD_USBH1_DIR__USBH1_DIR 0x1e5
-+ MX51_PAD_USBH1_NXT__USBH1_NXT 0x1e5
-+ MX51_PAD_USBH1_STP__USBH1_STP 0x1e5
-+ >;
-+ };
-+
-+ pinctrl_usbh2: usbh2grp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D16__USBH2_DATA0 0x1e5
-+ MX51_PAD_EIM_D17__USBH2_DATA1 0x1e5
-+ MX51_PAD_EIM_D18__USBH2_DATA2 0x1e5
-+ MX51_PAD_EIM_D19__USBH2_DATA3 0x1e5
-+ MX51_PAD_EIM_D20__USBH2_DATA4 0x1e5
-+ MX51_PAD_EIM_D21__USBH2_DATA5 0x1e5
-+ MX51_PAD_EIM_D22__USBH2_DATA6 0x1e5
-+ MX51_PAD_EIM_D23__USBH2_DATA7 0x1e5
-+ MX51_PAD_EIM_A24__USBH2_CLK 0x1e5
-+ MX51_PAD_EIM_A25__USBH2_DIR 0x1e5
-+ MX51_PAD_EIM_A27__USBH2_NXT 0x1e5
-+ MX51_PAD_EIM_A26__USBH2_STP 0x1e5
-+ >;
-+ };
-+
-+ pinctrl_usbotgreg: usbotgreggrp {
-+ fsl,pins = <
-+ MX51_PAD_GPIO1_8__GPIO1_8 0x0c5
-+ >;
-+ };
-+ };
-+};
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
-===================================================================
+From af6332e87452068b7c88da5b059f8b87188221cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 5 Jan 2023 17:31:02 +0100
+Subject: [PATCH 815/817] ARM: dts: apf51/apf51dev: rework device tree to
+ support APF51v2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Rework the device trees of the APF51 and APF51Dev boards to support
+the APF51 v2 SoM. The device trees are now as following:
+
+- imx51-apf51.dtsi: common for both APF51 SoM
+- imx51-apf51-v1.dtsi: for APF51 SoM, includes imx51-apf51.dtsi
+- imx51-apf51-v2.dtsi: for APF51v2 SoM, includes imx51-apf51.dtsi
+- imx51-apf51.dts: kept for compatibility, includes imx51-apf51-v1.dtsi
+
+- imx51-apf51dev.dtsi: APF51 Dev board base device tree
+- imx51-apf51dev.dts: APF51 Dev board with APF51 SoM, includes
+ imx51-apf51-v1.dtsi and imx51-apf51dev.dtsi.
+- imx51-apf51v2dev.dts: APF51 Dev board with APF51v2 SoM, includes
+ imx51-apf51-v2.dtsi and imx51-apf51dev.dtsi.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/Makefile | 2 +-
+ arch/arm/boot/dts/imx51-apf51-v1.dtsi | 5 +
+ arch/arm/boot/dts/imx51-apf51-v2.dtsi | 96 +++++++++++
+ arch/arm/boot/dts/imx51-apf51.dts | 85 +---------
+ arch/arm/boot/dts/imx51-apf51.dtsi | 94 +++++++++++
+ arch/arm/boot/dts/imx51-apf51dev.dts | 216 +------------------------
+ arch/arm/boot/dts/imx51-apf51dev.dtsi | 202 +++++++++++++++++++++++
+ arch/arm/boot/dts/imx51-apf51v2dev.dts | 12 ++
+ 8 files changed, 419 insertions(+), 293 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx51-apf51-v1.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-apf51.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-apf51v2dev.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 5e39a06d21ad..1d7caf11f404 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -389,8 +389,8 @@ dtb-$(CONFIG_SOC_IMX50) += \
+ imx50-evk.dtb \
+ imx50-kobo-aura.dtb
+ dtb-$(CONFIG_SOC_IMX51) += \
+- imx51-apf51.dtb \
+ imx51-apf51dev.dtb \
++ imx51-apf51v2dev.dtb \
+ imx51-babbage.dtb \
+ imx51-digi-connectcore-jsk.dtb \
+ imx51-eukrea-mbimxsd51-baseboard.dtb \
+diff --git a/arch/arm/boot/dts/imx51-apf51-v1.dtsi b/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+new file mode 100644
+index 000000000000..a646ea13392a
--- /dev/null
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
-@@ -0,0 +1,22 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ * Copyright 2012 Laurent Cans <lau...@gm...>
-+ *
-+ * Based on mx51-babbage.dts
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
++++ b/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+@@ -0,0 +1,5 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++//
++// Copyright 2023 Armadeus Systems <su...@ar...>
+
+#include "imx51-apf51.dtsi"
-+
-+/ {
-+ model = "Armadeus Systems APF51 V1 module";
-+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
-+};
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
-===================================================================
+diff --git a/arch/arm/boot/dts/imx51-apf51-v2.dtsi b/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+new file mode 100644
+index 000000000000..595a480490e9
--- /dev/null
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ * Copyright 2012 Laurent Cans <lau...@gm...>
-+ *
-+ * Based on mx51-babbage.dts
-+ * Copyright 2011 Freescale Semiconductor, Inc.
-+ * Copyright 2011 Linaro Ltd.
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
++++ b/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+@@ -0,0 +1,96 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++//
++// Copyright 2023 Armadeus Systems <su...@ar...>
+
+#include "imx51-apf51.dtsi"
+
-+/ {
-+ model = "Armadeus Systems APF51 V2 module";
-+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
-+};
-+
+&i2c2 {
-+ pmic: mc13892@09 {
++ pmic: mc13892@9 {
+ compatible = "fsl,mc13892";
-+ reg = <0x09>;
++ reg = <0x9>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pmic>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
+ fsl,mc13xxx-uses-rtc;
+ fsl,mc13xxx-uses-touch;
-+ /* adc makes the board reset so let's disable it for now */
-+ //fsl,mc13xxx-uses-adc;
-+
-+ touchscreen {
-+ ato = <128>;
-+ atox;
-+ };
++ fsl,mc13xxx-uses-adc;
+
+ leds {
+ #address-cells = <1>;
@@ -271,321 +101,77 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+
+ regulators {
-+ gpo2_reg: gpo2 { };
-+ gpo3_reg: gpo3 { };
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ imx51-apf51-v2 {
-+ pinctrl_pmic: pmicgrp {
-+ fsl,pins = <
-+ MX51_PAD_GPIO1_7__GPIO1_7 0x0c5 /* PMIC_IRQ */
-+ >;
-+ };
-+ };
-+};
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
-===================================================================
---- /dev/null
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx51-apf51-v2.dtsi"
-+#include "imx51-apf51dev.dtsi"
-+
-+/ {
-+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V2 SOM";
-+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
-+};
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
-===================================================================
---- /dev/null
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/ {
-+ backlight@bl1{
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_backlight>;
-+ compatible = "gpio-backlight";
-+ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-+ default-on;
-+ };
-+
-+ display@di1 {
-+ compatible = "fsl,imx-parallel-display";
-+ interface-pix-fmt = "bgr666";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ipu_disp1>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+ timing0: lw700 {
-+ clock-frequency = <33000033>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hback-porch = <96>;
-+ hfront-porch = <96>;
-+ vback-porch = <20>;
-+ vfront-porch = <21>;
-+ hsync-len = <64>;
-+ vsync-len = <4>;
-+ hsync-active = <1>;
-+ vsync-active = <1>;
-+ de-active = <1>;
-+ pixelclk-active = <1>;
++ pmic_reg_vddgp: sw1 {
++ regulator-name = "pmic_reg_vddgp";
++ regulator-min-microvolt = <1050000>;
++ regulator-max-microvolt = <1050000>;
++ regulator-boot-on;
++ regulator-always-on;
+ };
-+ };
+
-+ port {
-+ display_in: endpoint {
-+ remote-endpoint = <&ipu_di0_disp0>;
++ pmic_reg_vcore: sw2 {
++ regulator-name = "pmic_reg_vcore";
++ regulator-min-microvolt = <1225000>;
++ regulator-max-microvolt = <1225000>;
++ regulator-boot-on;
++ regulator-always-on;
+ };
-+ };
-+ };
+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_keys>;
++ pmic_reg_1v2: sw3 {
++ regulator-name = "pmic_reg_1v2";
++ regulator-min-microvolt = <1200000>;
++ regulator-max-microvolt = <1200000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
+
-+ user-key {
-+ label = "user";
-+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
-+ linux,code = <256>; /* BTN_0 */
-+ gpio-key,wakeup;
-+ };
-+ };
++ pmic_reg_1v8: sw4 {
++ regulator-name = "pmic_reg_1v8";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
+
-+ leds {
-+ compatible = "gpio-leds";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_gpio_leds>;
++ pmic_reg_1v8_ana_pll: vpll {
++ regulator-name = "pmic_reg_1v8_ana_pll";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
+
-+ user {
-+ label = "Heartbeat";
-+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
-+ linux,default-trigger = "heartbeat";
++ pmic_reg_vusb: vusb2 {
++ regulator-name = "pmic_reg_vusb";
++ regulator-min-microvolt = <2600000>;
++ regulator-max-microvolt = <2600000>;
++ regulator-boot-on;
++ regulator-always-on;
++ };
+ };
+
-+ backlight {
-+ label = "Backlight";
-+ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-+ default-state = "on";
++ touchscreen {
++ ato = <128>;
++ atox;
+ };
+ };
+};
+
-+&ecspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
-+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
-+ <&gpio4 25 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&ecspi2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi2>;
-+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
-+ <&gpio3 27 GPIO_ACTIVE_LOW>;
-+ status = "okay";
-+
-+ spidev: spidev@1 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "spidev";
-+ spi-max-frequency = <25000000>;
-+ reg = <1>;
-+ };
-+};
-+
-+&esdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc1>;
-+ cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
-+ bus-width = <4>;
-+ status = "okay";
-+};
-+
-+&esdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_esdhc2 &pinctrl_wifi>;
-+ bus-width = <4>;
-+ status = "okay";
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2 &pinctrl_bluetooth>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
-+&ipu_di0_disp0 {
-+ remote-endpoint = <&display_in>;
-+};
-+
+&iomuxc {
-+ imx51-apf51dev {
-+ pinctrl_backlight: bl1grp {
-+ fsl,pins = <
-+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
-+ >;
-+ };
-+
-+ pinctrl_bluetooth: bluetoothgrp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_CS3__GPIO2_28 0x0c5
-+ >;
-+ };
-+
-+ pinctrl_ecspi1: ecspi1grp {
-+ fsl,pins = <
-+ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0c5
-+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0c5
-+ MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
-+ MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
-+ MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
-+ >;
-+ };
-+
-+ pinctrl_ecspi2: ecspi2grp {
-+ fsl,pins = <
-+ MX51_PAD_NANDF_D13__GPIO3_27 0x0c5
-+ MX51_PAD_NANDF_D12__GPIO3_28 0x0c5
-+ MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
-+ MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
-+ MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
-+ >;
-+ };
-+
-+ pinctrl_esdhc1: esdhc1grp {
-+ fsl,pins = <
-+ MX51_PAD_EIM_CS4__GPIO2_29 0x100
-+ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
-+ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
-+ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-+ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-+ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-+ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_esdhc2: esdhc2grp {
-+ fsl,pins = <
-+ MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
-+ MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
-+ MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
-+ MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
-+ MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
-+ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
-+ >;
-+ };
-+
-+ pinctrl_gpio_keys: gpiokeysgrp {
-+ fsl,pins = <
-+ MX51_PAD_GPIO1_3__GPIO1_3 0x0c5
-+ >;
-+ };
-+
-+ pinctrl_gpio_leds: gpioledsgrp {
-+ fsl,pins = <
-+ MX51_PAD_GPIO1_2__GPIO1_2 0x0c5
-+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0c5
-+ >;
-+ };
-+
-+ pinctrl_ipu_disp1: ipudisp1grp {
-+ fsl,pins = <
-+ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
-+ MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
-+ MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
-+ MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
-+ MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
-+ MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
-+ MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
-+ MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
-+ MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
-+ MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
-+ MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
-+ MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
-+ MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
-+ MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
-+ MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
-+ MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
-+ MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
-+ MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
-+ MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
-+ MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
-+ MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
-+ MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
-+ MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
-+ MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
-+ MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
-+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
-+ MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
-+ >;
-+ };
-+
-+ pinctrl_wifi: wifigrp {
++ imx51-apf51-v2 {
++ pinctrl_pmic: pmicgrp {
+ fsl,pins = <
-+ MX51_PAD_EIM_EB2__GPIO2_22 0x0c5
-+ MX51_PAD_EIM_EB3__GPIO2_23 0x0c5
++ MX51_PAD_GPIO1_7__GPIO1_7 0x0c5 /* PMIC_IRQ */
+ >;
+ };
+ };
+};
-Index: linux-4.0-rc1/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-4.0-rc1.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.0-rc1/arch/arm/boot/dts/Makefile
-@@ -230,8 +230,8 @@ dtb-$(CONFIG_SOC_IMX35) += \
- dtb-$(CONFIG_SOC_IMX50) += \
- imx50-evk.dtb
- dtb-$(CONFIG_SOC_IMX51) += \
-- imx51-apf51.dtb \
- imx51-apf51dev.dtb \
-+ imx51-apf51dev-v2.dtb \
- imx51-babbage.dtb \
- imx51-digi-connectcore-jsk.dtb \
- imx51-eukrea-mbimxsd51-baseboard.dtb
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
-===================================================================
---- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51.dts
-+++ /dev/null
-@@ -1,89 +0,0 @@
+diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
+index ba28ffe06fe2..a74cc1680dc2 100644
+--- a/arch/arm/boot/dts/imx51-apf51.dts
++++ b/arch/arm/boot/dts/imx51-apf51.dts
+@@ -1,84 +1,5 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2012 Armadeus Systems - <su...@ar...>
- * Copyright 2012 Laurent Cans <lau...@gm...>
@@ -593,15 +179,10 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
- * Based on mx51-babbage.dts
- * Copyright 2011 Freescale Semiconductor, Inc.
- * Copyright 2011 Linaro Ltd.
-- *
-- * The code contained herein is licensed under the GNU General Public
-- * License. You may obtain a copy of the GNU General Public License
-- * Version 2 or later at the following locations:
-- *
-- * http://www.opensource.org/licenses/gpl-license.html
-- * http://www.gnu.org/copyleft/gpl.html
- */
--
++//
++// Copyright 2023 Armadeus Systems <su...@ar...>
+
-/dts-v1/;
-#include "imx51.dtsi"
-
@@ -609,7 +190,8 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
- model = "Armadeus Systems APF51 module";
- compatible = "armadeus,imx51-apf51", "fsl,imx51";
-
-- memory {
+- memory@90000000 {
+- device_type = "memory";
- reg = <0x90000000 0x20000000>;
- };
-
@@ -624,7 +206,7 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "mii";
-- phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
+- phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <1>;
- status = "okay";
-};
@@ -675,20 +257,118 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
-};
-Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-===================================================================
---- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -1,5 +1,5 @@
- /*
++#include "imx51-apf51-v1.dtsi"
+diff --git a/arch/arm/boot/dts/imx51-apf51.dtsi b/arch/arm/boot/dts/imx51-apf51.dtsi
+new file mode 100644
+index 000000000000..b6f39957286b
+--- /dev/null
++++ b/arch/arm/boot/dts/imx51-apf51.dtsi
+@@ -0,0 +1,94 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ * Copyright 2012 Laurent Cans <lau...@gm...>
++ *
++ * Based on mx51-babbage.dts
++ * Copyright 2011 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ */
++
++#include "imx51.dtsi"
++
++/ {
++ memory@90000000 {
++ device_type = "memory";
++ reg = <0x90000000 0x20000000>;
++ };
++
++ clocks {
++ osc {
++ clock-frequency = <33554432>;
++ };
++ };
++};
++
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_fec>;
++ phy-mode = "mii";
++ phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
++ phy-reset-duration = <1>;
++ status = "okay";
++};
++
++&i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2>;
++ clock-frequency = <400000>;
++ status = "okay";
++};
++
++&nfc {
++ nand-bus-width = <8>;
++ nand-ecc-mode = "hw";
++ nand-on-flash-bbt;
++ status = "okay";
++};
++
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3>;
++ status = "okay";
++};
++
++&iomuxc {
++ imx51-apf51 {
++ pinctrl_fec: fecgrp {
++ fsl,pins = <
++ MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
++ MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
++ MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
++ MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
++ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
++ MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
++ MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
++ MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
++ MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
++ MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
++ MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
++ MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
++ MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
++ MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
++ MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
++ MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
++ MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
++ MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
++ >;
++ };
++
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
++ MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
++ >;
++ };
++
++ pinctrl_uart3: uart3grp {
++ fsl,pins = <
++ MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
++ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
++ >;
++ };
++ };
++};
+diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts
+index c66f274ba4e9..d4fd5ccc0a8a 100644
+--- a/arch/arm/boot/dts/imx51-apf51dev.dts
++++ b/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -1,217 +1,13 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later
+-/*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
-@@ -9,217 +9,11 @@
- * http://www.gnu.org/copyleft/gpl.html
- */
+- */
++//
++// Copyright 2023 Armadeus Systems - <su...@ar...>
-/* APF51Dev is a docking board for the APF51 SOM */
-#include "imx51-apf51.dts"
@@ -698,10 +378,10 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
/ {
- model = "Armadeus Systems APF51Dev docking/development board";
-+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
++ model = "Armadeus Systems APF51Dev docking/development board with APF51v1 SoM";
compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
--
-- backlight@bl1{
+
+- backlight {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_backlight>;
- compatible = "gpio-backlight";
@@ -709,7 +389,7 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
- default-on;
- };
-
-- display@di1 {
+- disp1 {
- compatible = "fsl,imx-parallel-display";
- interface-pix-fmt = "bgr666";
- pinctrl-names = "default";
@@ -736,7 +416,7 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-
- port {
- display_in: endpoint {
-- remote-endpoint = <&ipu_di0_disp0>;
+- remote-endpoint = <&ipu_di0_disp1>;
- };
- };
- };
@@ -765,16 +445,14 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-&ecspi1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_ecspi1>;
-- fsl,spi-num-chipselects = <2>;
-- cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
-- <&gpio4 25 GPIO_ACTIVE_HIGH>;
+- cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>,
+- <&gpio4 25 GPIO_ACTIVE_LOW>;
- status = "okay";
-};
-
-&ecspi2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_ecspi2>;
-- fsl,spi-num-chipselects = <2>;
- cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
- <&gpio3 27 GPIO_ACTIVE_LOW>;
- status = "okay";
@@ -783,7 +461,7 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-&esdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc1>;
-- cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
+- cd-gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
- bus-width = <4>;
- status = "okay";
-};
@@ -807,7 +485,7 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
- pinctrl-0 = <&pinctrl_hog>;
-
- imx51-apf51dev {
-- pinctrl_backlight: bl1grp {
+- pinctrl_backlight: backlightgrp {
- fsl,pins = <
- MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
- >;
@@ -905,6 +583,235 @@ Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
- };
-};
-
--&ipu_di0_disp0 {
+-&ipu_di0_disp1 {
- remote-endpoint = <&display_in>;
};
+diff --git a/arch/arm/boot/dts/imx51-apf51dev.dtsi b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+new file mode 100644
+index 000000000000..84eec372a4a9
+--- /dev/null
++++ b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -0,0 +1,202 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++//
++// Copyright 2023 Armadeus Systems - <su...@ar...>
++
++/ {
++ backlight {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_backlight>;
++ compatible = "gpio-backlight";
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
++ default-on;
++ };
++
++ display {
++ compatible = "fsl,imx-parallel-display";
++ interface-pix-fmt = "bgr666";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu_disp1>;
++
++ display-timings {
++ native-mode = <&timing0>;
++ timing0: lw700 {
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ hsync-active = <1>;
++ vsync-active = <1>;
++ de-active = <1>;
++ pixelclk-active = <1>;
++ };
++ };
++
++ port {
++ display_in: endpoint {
++ remote-endpoint = <&ipu_di0_disp1>;
++ };
++ };
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++
++ user-key {
++ label = "user";
++ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
++ linux,code = <256>; /* BTN_0 */
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ led-user {
++ label = "Heartbeat";
++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "heartbeat";
++ };
++ };
++};
++
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1>;
++ cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>,
++ <&gpio4 25 GPIO_ACTIVE_LOW>;
++ status = "okay";
++};
++
++&ecspi2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi2>;
++ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
++ <&gpio3 27 GPIO_ACTIVE_LOW>;
++ status = "okay";
++};
++
++&esdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_esdhc1>;
++ cd-gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
++ bus-width = <4>;
++ status = "okay";
++};
++
++&esdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_esdhc2>;
++ bus-width = <4>;
++ non-removable;
++ status = "okay";
++};
++
++&ipu_di0_disp1 {
++ remote-endpoint = <&display_in>;
++};
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ imx51-apf51dev {
++ pinctrl_backlight: backlightgrp {
++ fsl,pins = <
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
++ >;
++ };
++
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
++ MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
++ MX51_PAD_EIM_CS4__GPIO2_29 0x100
++ MX51_PAD_NANDF_D13__GPIO3_27 0x0C5
++ MX51_PAD_NANDF_D12__GPIO3_28 0x0C5
++ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0C5
++ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
++ MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
++ MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
++ >;
++ };
++
++ pinctrl_ecspi1: ecspi1grp {
++ fsl,pins = <
++ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0c5
++ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0c5
++ MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
++ MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
++ MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
++ >;
++ };
++
++ pinctrl_ecspi2: ecspi2grp {
++ fsl,pins = <
++ MX51_PAD_NANDF_D13__GPIO3_27 0x0c5
++ MX51_PAD_NANDF_D12__GPIO3_28 0x0c5
++ MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
++ MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
++ MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
++ >;
++ };
++
++ pinctrl_esdhc1: esdhc1grp {
++ fsl,pins = <
++ MX51_PAD_EIM_CS4__GPIO2_29 0x100
++ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
++ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
++ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
++ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
++ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
++ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
++ >;
++ };
++
++ pinctrl_esdhc2: esdhc2grp {
++ fsl,pins = <
++ MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
++ MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
++ MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
++ MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
++ MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
++ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
++ >;
++ };
++
++ pinctrl_ipu_disp1: ipudisp1grp {
++ fsl,pins = <
++ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
++ MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
++ MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
++ MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
++ MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
++ MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
++ MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
++ MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
++ MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
++ MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
++ MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
++ MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
++ MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
++ MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
++ MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
++ MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
++ MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
++ MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
++ MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
++ MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
++ MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
++ MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
++ MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
++ MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
++ MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
++ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
++ >;
++ };
++ };
++};
+diff --git a/arch/arm/boot/dts/imx51-apf51v2dev.dts b/arch/arm/boot/dts/imx51-apf51v2dev.dts
+new file mode 100644
+index 000000000000..c2d42b864b79
+--- /dev/null
++++ b/arch/arm/boot/dts/imx51-apf51v2dev.dts
+@@ -0,0 +1,12 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++//
++// Copyright 2023 Armadeus Systems - <su...@ar...>
++
++/dts-v1/;
++#include "imx51-apf51-v2.dtsi"
++#include "imx51-apf51dev.dtsi"
++
++/ {
++ model = "Armadeus Systems APF51Dev docking/development board with APF51v2 SoM";
++ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
++};
+--
+2.38.2
+
diff --git a/patches/linux/5.10/0816-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-key.patch b/patches/linux/5.10/0816-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-key.patch
new file mode 100644
index 000000000..55e59244f
--- /dev/null
+++ b/patches/linux/5.10/0816-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-key.patch
@@ -0,0 +1,58 @@
+From 5a45e39a34adad5f56b34ade98a802eb7c147b47 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 5 Jan 2023 17:52:39 +0100
+Subject: [PATCH 816/817] ARM: dts: apf51dev: add pinctrl properties to
+ gpio-key
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx51-apf51dev.dtsi | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx51-apf51dev.dtsi b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+index 84eec372a4a9..104fe769abc7 100644
+--- a/arch/arm/boot/dts/imx51-apf51dev.dtsi
++++ b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -45,11 +45,14 @@ display_in: endpoint {
+
+ gpio-keys {
+ compatible = "gpio-keys";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_keys>;
+
+ user-key {
+ label = "user";
+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+ linux,code = <256>; /* BTN_0 */
++ gpio-key,wakeup;
+ };
+ };
+
+@@ -121,7 +124,6 @@ MX51_PAD_NANDF_D12__GPIO3_28 0x0C5
+ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0C5
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+ MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ >;
+ };
+
+@@ -168,6 +170,12 @@ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
+ >;
+ };
+
++ pinctrl_gpio_keys: gpiokeysgrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_3__GPIO1_3 0x0c5
++ >;
++ };
++
+ pinctrl_ipu_disp1: ipudisp1grp {
+ fsl,pins = <
+ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
+--
+2.38.2
+
diff --git a/patches/linux/5.10/0817-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-led.patch b/patches/linux/5.10/0817-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-led.patch
new file mode 100644
index 000000000..405e3fe7e
--- /dev/null
+++ b/patches/linux/5.10/0817-ARM-dts-apf51dev-add-pinctrl-properties-to-gpio-led.patch
@@ -0,0 +1,52 @@
+From feb840f85f569052782c42294219a627e8f9d3f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 5 Jan 2023 17:54:23 +0100
+Subject: [PATCH 817/817] ARM: dts: apf51dev: add pinctrl properties to
+ gpio-led
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm/boot/dts/imx51-apf51dev.dtsi | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx51-apf51dev.dtsi b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+index 104fe769abc7..646e751a27a5 100644
+--- a/arch/arm/boot/dts/imx51-apf51dev.dtsi
++++ b/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -58,6 +58,8 @@ user-key {
+
+ leds {
+ compatible = "gpio-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_leds>;
+
+ led-user {
+ label = "Heartbeat";
+@@ -123,7 +125,6 @@ MX51_PAD_NANDF_D13__GPIO3_27 0x0C5
+ MX51_PAD_NANDF_D12__GPIO3_28 0x0C5
+ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0C5
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+- MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+ >;
+ };
+
+@@ -176,6 +177,12 @@ MX51_PAD_GPIO1_3__GPIO1_3 0x0c5
+ >;
+ };
+
++ pinctrl_gpio_leds: gpioledsgrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_2__GPIO1_2 0x0c5
++ >;
++ };
++
+ pinctrl_ipu_disp1: ipudisp1grp {
+ fsl,pins = <
+ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
+--
+2.38.2
+
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2022-12-15 15:57:46
|
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 f4c1bb4e294742f64341886758f50f27d881fcc5 (commit)
from 47719697a103ec05b46af866f525945a6671ced0 (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 f4c1bb4e294742f64341886758f50f27d881fcc5
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 15 16:52:17 2022 +0100
[BUILDROOT] 2022.02: patches to fix libzlib downloading
Bump to 1.2.13
-----------------------------------------------------------------------
Summary of changes:
...18-package-libzlib-bump-to-version-1.2.13.patch | 177 +++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +
2 files changed, 182 insertions(+)
create mode 100644 patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
diff --git a/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch b/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
new file mode 100644
index 000000000..6dc845b95
--- /dev/null
+++ b/patches/buildroot/2022.02/418-package-libzlib-bump-to-version-1.2.13.patch
@@ -0,0 +1,177 @@
+From 5a948e32fece110c6208c1b0fa1a05d55037a7e7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sun, 23 Oct 2022 18:50:26 +0200
+Subject: [PATCH 1/1] package/libzlib: bump to version 1.2.13
+
+- Drop all patches (already in version)
+- Replace README by LICENSE file added with
+ https://github.com/madler/zlib/commit/352cb28d12baf02863ff5d4d96be0587ced419a1
+
+https://github.com/madler/zlib/releases/tag/v1.2.13
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...hat-discarded-provided-CC-definition.patch | 28 ---------------
+ package/libzlib/0002-fix-CVE-2022-37434.patch | 35 -------------------
+ .../0003-fix-CVE-2022-37434-regression.patch | 32 -----------------
+ package/libzlib/libzlib.hash | 4 +--
+ package/libzlib/libzlib.mk | 7 ++--
+ 5 files changed, 4 insertions(+), 102 deletions(-)
+ delete mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+ delete mode 100644 package/libzlib/0002-fix-CVE-2022-37434.patch
+ delete mode 100644 package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+
+diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+deleted file mode 100644
+index 398e1c9481..0000000000
+--- a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
++++ /dev/null
+@@ -1,28 +0,0 @@
+-From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+-From: Mark Adler <ma...@al...>
+-Date: Mon, 28 Mar 2022 18:34:10 -0700
+-Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+-
+-Downloaded from upstream commit:
+-https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
+-
+-Signed-off-by: Bernd Kuhls <ber...@t-...>
+----
+- configure | 3 +++
+- 1 file changed, 3 insertions(+)
+-
+-diff --git a/configure b/configure
+-index 52ff4a04e..3fa3e8618 100755
+---- a/configure
+-+++ b/configure
+-@@ -174,7 +174,10 @@ if test -z "$CC"; then
+- else
+- cc=${CROSS_PREFIX}cc
+- fi
+-+else
+-+ cc=${CC}
+- fi
+-+
+- cflags=${CFLAGS-"-O3"}
+- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+- case "$cc" in
+diff --git a/package/libzlib/0002-fix-CVE-2022-37434.patch b/package/libzlib/0002-fix-CVE-2022-37434.patch
+deleted file mode 100644
+index a61be48536..0000000000
+--- a/package/libzlib/0002-fix-CVE-2022-37434.patch
++++ /dev/null
+@@ -1,35 +0,0 @@
+-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
+-From: Mark Adler <fo...@ma...>
+-Date: Sat, 30 Jul 2022 15:51:11 -0700
+-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
+- inflate().
+-
+-If the extra field was larger than the space the user provided with
+-inflateGetHeader(), and if multiple calls of inflate() delivered
+-the extra header data, then there could be a buffer overflow of the
+-provided space. This commit assures that provided space is not
+-exceeded.
+-
+-Backported from: eff308af425b67093bab25f80f1ae950166bece1
+-Signed-off-by: Marcus Hoffmann <mar...@ot...>
+----
+- inflate.c | 5 +++--
+- 1 file changed, 3 insertions(+), 2 deletions(-)
+-
+-diff --git a/inflate.c b/inflate.c
+-index 7be8c6366..7a7289749 100644
+---- a/inflate.c
+-+++ b/inflate.c
+-@@ -763,9 +763,10 @@ int flush;
+- copy = state->length;
+- if (copy > have) copy = have;
+- if (copy) {
+-+ len = state->head->extra_len - state->length;
+- if (state->head != Z_NULL &&
+-- state->head->extra != Z_NULL) {
+-- len = state->head->extra_len - state->length;
+-+ state->head->extra != Z_NULL &&
+-+ len < state->head->extra_max) {
+- zmemcpy(state->head->extra + len, next,
+- len + copy > state->head->extra_max ?
+- state->head->extra_max - len : copy);
+diff --git a/package/libzlib/0003-fix-CVE-2022-37434-regression.patch b/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+deleted file mode 100644
+index 46a58710d2..0000000000
+--- a/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
+-From: Mark Adler <fo...@ma...>
+-Date: Mon, 8 Aug 2022 10:50:09 -0700
+-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
+- state->head.
+-
+-The recent commit to fix a gzip header extra field processing bug
+-introduced the new bug fixed here.
+-
+-Backported from: 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
+-Signed-off-by: Marcus Hoffmann <mar...@ot...>
+----
+- inflate.c | 4 ++--
+- 1 file changed, 2 insertions(+), 2 deletions(-)
+-
+-diff --git a/inflate.c b/inflate.c
+-index 7a7289749..2a3c4fe98 100644
+---- a/inflate.c
+-+++ b/inflate.c
+-@@ -763,10 +763,10 @@ int flush;
+- copy = state->length;
+- if (copy > have) copy = have;
+- if (copy) {
+-- len = state->head->extra_len - state->length;
+- if (state->head != Z_NULL &&
+- state->head->extra != Z_NULL &&
+-- len < state->head->extra_max) {
+-+ (len = state->head->extra_len - state->length) <
+-+ state->head->extra_max) {
+- zmemcpy(state->head->extra + len, next,
+- len + copy > state->head->extra_max ?
+- state->head->extra_max - len : copy);
+diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
+index e6ca974e2f..df5e8d723a 100644
+--- a/package/libzlib/libzlib.hash
++++ b/package/libzlib/libzlib.hash
+@@ -1,4 +1,4 @@
+ # From http://www.zlib.net/
+-sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
++sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz
+ # License files, locally calculated
+-sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README
++sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE
+diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
+index f75502326b..e344cc7ad9 100644
+--- a/package/libzlib/libzlib.mk
++++ b/package/libzlib/libzlib.mk
+@@ -4,19 +4,16 @@
+ #
+ ################################################################################
+
+-LIBZLIB_VERSION = 1.2.12
++LIBZLIB_VERSION = 1.2.13
+ LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+ LIBZLIB_SITE = http://www.zlib.net
+ LIBZLIB_LICENSE = Zlib
+-LIBZLIB_LICENSE_FILES = README
++LIBZLIB_LICENSE_FILES = LICENSE
+ LIBZLIB_INSTALL_STAGING = YES
+ LIBZLIB_PROVIDES = zlib
+ LIBZLIB_CPE_ID_VENDOR = zlib
+ LIBZLIB_CPE_ID_PRODUCT = zlib
+
+-# 0002-fix-CVE-2022-37434.patch
+-LIBZLIB_IGNORE_CVES = CVE-2022-37434
+-
+ # It is not possible to build only a shared version of zlib, so we build both
+ # shared and static, unless we only want the static libs, and we eventually
+ # selectively remove what we do not want
+--
+2.37.4
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 30bdbf58f..b20407be1 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -46,6 +46,11 @@ rm -rf buildroot/package/libimxvpuapi2/Config.in
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
+rm -rf buildroot/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+rm -rf buildroot/package/libzlib/0002-fix-CVE-2022-37434.patch
+rm -rf buildroot/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
+rm -rf buildroot/package/libzlib/libzlib.hash
+rm -rf buildroot/package/libzlib/libzlib.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2022-12-13 08:21:41
|
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/u-boot".
The branch, opos6ul-2018.05 has been updated
via 979806a06266e394d6c837163d1fb489659d0c69 (commit)
via 64a0e05613ae3fa87e9dfdd8cfe51b9af397163b (commit)
via a159764c2ac0e8fbf2e6880ceb25058140483ae6 (commit)
from 1c14d7f084088e86d5cc274bd7daed1c859c2f2c (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 979806a06266e394d6c837163d1fb489659d0c69
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Dec 12 16:25:03 2022 +0100
spi: soft_spi: add dcx GPIO (optional)
commit 64a0e05613ae3fa87e9dfdd8cfe51b9af397163b
Author: Christophe Kerello <chr...@st...>
Date: Fri Aug 2 15:46:29 2019 +0200
spi: soft_spi: Fix data abort if slave is not probed
In case spi_get_bus_and_cs callback is used, spi bus is first probed
then slave devices are probed. To avoid a data abort in soft_spi probe
function, we need to check that (slave != NULL).
If slave is NULL, cs_flags and clk_flags will be initialized with
respectively GPIOD_ACTIVE_LOW and 0.
Signed-off-by: Christophe Kerello <chr...@st...>
Signed-off-by: Patrice Chotard <pat...@st...>
Reviewed-by: Jagan Teki <ja...@am...>
commit a159764c2ac0e8fbf2e6880ceb25058140483ae6
Author: Johannes Holland <joh...@in...>
Date: Mon May 11 15:22:26 2020 +0200
spi: add support for all spi modes with soft spi
The spi bitbanging driver did not implement all spi modes properly. Add
code to support all spi modes, honoring soft_spi_set_mode() and
defaulting to spi mode 0. Previously, CPHA was implemented inversely
(defaulting to CPHA=1) and CPOL=1 was hardcoded.
Signed-off-by: Johannes Holland <joh...@in...>
Reviewed-by: Jagan Teki <ja...@am...>
-----------------------------------------------------------------------
Summary of changes:
drivers/spi/soft_spi.c | 73 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 60 insertions(+), 13 deletions(-)
diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index b06883f9d0..6d14dcd09a 100644
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -24,6 +24,7 @@ struct soft_spi_platdata {
struct gpio_desc sclk;
struct gpio_desc mosi;
struct gpio_desc miso;
+ struct gpio_desc dcx;
int spi_delay_us;
int flags;
};
@@ -45,6 +46,17 @@ static int soft_spi_scl(struct udevice *dev, int bit)
return 0;
}
+static int soft_spi_dcx(struct udevice *dev, int bit)
+{
+ struct udevice *bus = dev_get_parent(dev);
+ struct soft_spi_platdata *plat = dev_get_platdata(bus);
+
+ if (dm_gpio_is_valid(&plat->dcx))
+ dm_gpio_set_value(&plat->dcx, bit);
+
+ return 0;
+}
+
static int soft_spi_sda(struct udevice *dev, int bit)
{
struct udevice *bus = dev_get_parent(dev);
@@ -58,10 +70,12 @@ static int soft_spi_sda(struct udevice *dev, int bit)
static int soft_spi_cs_activate(struct udevice *dev)
{
struct udevice *bus = dev_get_parent(dev);
+ struct soft_spi_priv *priv = dev_get_priv(bus);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
+ int cidle = !!(priv->mode & SPI_CPOL);
dm_gpio_set_value(&plat->cs, 0);
- dm_gpio_set_value(&plat->sclk, 0);
+ dm_gpio_set_value(&plat->sclk, cidle); /* to idle */
dm_gpio_set_value(&plat->cs, 1);
return 0;
@@ -79,11 +93,14 @@ static int soft_spi_cs_deactivate(struct udevice *dev)
static int soft_spi_claim_bus(struct udevice *dev)
{
+ struct udevice *bus = dev_get_parent(dev);
+ struct soft_spi_priv *priv = dev_get_priv(bus);
+ int cidle = !!(priv->mode & SPI_CPOL);
/*
* Make sure the SPI clock is in idle state as defined for
* this slave.
*/
- return soft_spi_scl(dev, 0);
+ return soft_spi_scl(dev, cidle);
}
static int soft_spi_release_bus(struct udevice *dev)
@@ -114,7 +131,8 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
uchar tmpdout = 0;
const u8 *txd = dout;
u8 *rxd = din;
- int cpha = priv->mode & SPI_CPHA;
+ int cpha = !!(priv->mode & SPI_CPHA);
+ int cidle = !!(priv->mode & SPI_CPOL);
unsigned int j;
debug("spi_xfer: slave %s:%s dout %08X din %08X bitlen %u\n",
@@ -140,22 +158,48 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
tmpdin = 0;
}
- if (!cpha)
- soft_spi_scl(dev, 0);
+ /*
+ * dcx
+ *
+ */
+ soft_spi_dcx(dev, (j == 0) ? 1 : 0);
+
+ /*
+ * CPOL 0: idle is low (0), active is high (1)
+ * CPOL 1: idle is high (1), active is low (0)
+ */
+
+ /*
+ * drive bit
+ * CPHA 1: CLK from idle to active
+ */
+ if (cpha)
+ soft_spi_scl(dev, !cidle);
if ((plat->flags & SPI_MASTER_NO_TX) == 0)
soft_spi_sda(dev, !!(tmpdout & 0x80));
udelay(plat->spi_delay_us);
- if (cpha)
- soft_spi_scl(dev, 0);
+
+ /*
+ * sample bit
+ * CPHA 0: CLK from idle to active
+ * CPHA 1: CLK from active to idle
+ */
+ if (!cpha)
+ soft_spi_scl(dev, !cidle);
else
- soft_spi_scl(dev, 1);
+ soft_spi_scl(dev, cidle);
tmpdin <<= 1;
if ((plat->flags & SPI_MASTER_NO_RX) == 0)
tmpdin |= dm_gpio_get_value(&plat->miso);
tmpdout <<= 1;
udelay(plat->spi_delay_us);
- if (cpha)
- soft_spi_scl(dev, 1);
+
+ /*
+ * drive bit
+ * CPHA 0: CLK from active to idle
+ */
+ if (!cpha)
+ soft_spi_scl(dev, cidle);
}
/*
* If the number of bits isn't a multiple of 8, shift the last
@@ -176,7 +220,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
static int soft_spi_set_speed(struct udevice *dev, unsigned int speed)
{
- /* Accept any speed */
+ /* Ignore any speed settings. Speed is implemented via "spi-delay-us" */
return 0;
}
@@ -215,8 +259,8 @@ static int soft_spi_probe(struct udevice *dev)
int cs_flags, clk_flags;
int ret;
- cs_flags = (slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
- clk_flags = (slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
+ cs_flags = (slave && slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
+ clk_flags = (slave && slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
if (gpio_request_by_name(dev, "cs-gpios", 0, &plat->cs,
GPIOD_IS_OUT | cs_flags) ||
@@ -238,6 +282,9 @@ static int soft_spi_probe(struct udevice *dev)
(SPI_MASTER_NO_RX | SPI_MASTER_NO_TX))
return -EINVAL;
+ gpio_request_by_name(dev, "gpio-dcx", 0, &plat->dcx,
+ GPIOD_IS_OUT | GPIOD_ACTIVE_LOW);
+
return 0;
}
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2022-12-13 08:19: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 47719697a103ec05b46af866f525945a6671ced0 (commit)
from c7540da811de225ef4d9f27e77e391f9787a9366 (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 47719697a103ec05b46af866f525945a6671ced0
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Dec 13 09:15:33 2022 +0100
[BUILDROOT] Bump BR to 2022.02.8
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 923218a42..3373c6dee 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 7
+BUILDROOT_MINOR_VERSION ?= 8
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-11-17 11:32: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 c7540da811de225ef4d9f27e77e391f9787a9366 (commit)
from 78d941903ae11f78cf4769989368571f2bda53cd (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 c7540da811de225ef4d9f27e77e391f9787a9366
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Nov 17 12:28:29 2022 +0100
[BUILDROOT] Bump BR to 2022.02.7
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../416-package-expat-bump-to-version-2.4.9.patch | 123 ---------------------
patches/buildroot/2022.02/cleanup_buildroot.sh | 3 -
3 files changed, 1 insertion(+), 127 deletions(-)
delete mode 100644 patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
diff --git a/Makefile b/Makefile
index dd16dae18..923218a42 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 6
+BUILDROOT_MINOR_VERSION ?= 7
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch b/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
deleted file mode 100644
index ceac53ed4..000000000
--- a/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From f7772a54dbe49f1ee052d7a071113861a410e172 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fon...@gm...>
-Date: Wed, 21 Sep 2022 23:07:33 +0200
-Subject: [PATCH 1/1] package/expat: bump to version 2.4.9
-
-- Drop patch (akready in version)
-- Update hash of COPYING (year updated with
- https://github.com/libexpat/libexpat/commit/39b2e99355039626438d48a4eca6aacba2b44d5e)
-
-https://blog.hartwork.org/posts/expat-2-4-9-released
-https://github.com/libexpat/libexpat/blob/R_2_4_9/expat/Changes
-
-Signed-off-by: Fabrice Fontaine <fon...@gm...>
-Signed-off-by: Thomas Petazzoni <tho...@bo...>
----
- ...re-safe-exiting-internalEntityParser.patch | 53 -------------------
- package/expat/expat.hash | 10 ++--
- package/expat/expat.mk | 5 +-
- 3 files changed, 6 insertions(+), 62 deletions(-)
- delete mode 100644 package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
-
-diff --git a/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch b/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
-deleted file mode 100644
-index ca86e85115..0000000000
---- a/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
-+++ /dev/null
-@@ -1,53 +0,0 @@
--From 4a32da87e931ba54393d465bb77c40b5c33d343b Mon Sep 17 00:00:00 2001
--From: Rhodri James <rh...@wi...>
--Date: Wed, 17 Aug 2022 18:26:18 +0100
--Subject: [PATCH] Ensure raw tagnames are safe exiting internalEntityParser
--
--It is possible to concoct a situation in which parsing is
--suspended while substituting in an internal entity, so that
--XML_ResumeParser directly uses internalEntityProcessor as
--its processor. If the subsequent parse includes some unclosed
--tags, this will return without calling storeRawNames to ensure
--that the raw versions of the tag names are stored in memory other
--than the parse buffer itself. If the parse buffer is then changed
--or reallocated (for example if processing a file line by line),
--badness will ensue.
--
--This patch ensures storeRawNames is always called when needed
--after calling doContent. The earlier call do doContent does
--not need the same protection; it only deals with entity
--substitution, which cannot leave unbalanced tags, and in any
--case the raw names will be pointing into the stored entity
--value not the parse buffer.
--
--[Retrieved from:
--https://github.com/libexpat/libexpat/commit/4a32da87e931ba54393d465bb77c40b5c33d343b]
--Signed-off-by: Fabrice Fontaine <fon...@gm...>
-----
-- expat/lib/xmlparse.c | 13 +++++++++----
-- 1 file changed, 9 insertions(+), 4 deletions(-)
--
--diff --git a/lib/xmlparse.c b/lib/xmlparse.c
--index 7bcabf7f4..d73f419cf 100644
----- a/lib/xmlparse.c
--+++ b/lib/xmlparse.c
--@@ -5826,10 +5826,15 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
-- {
-- parser->m_processor = contentProcessor;
-- /* see externalEntityContentProcessor vs contentProcessor */
--- return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
--- s, end, nextPtr,
--- (XML_Bool)! parser->m_parsingStatus.finalBuffer,
--- XML_ACCOUNT_DIRECT);
--+ result = doContent(parser, parser->m_parentParser ? 1 : 0,
--+ parser->m_encoding, s, end, nextPtr,
--+ (XML_Bool)! parser->m_parsingStatus.finalBuffer,
--+ XML_ACCOUNT_DIRECT);
--+ if (result == XML_ERROR_NONE) {
--+ if (! storeRawNames(parser))
--+ return XML_ERROR_NO_MEMORY;
--+ }
--+ return result;
-- }
-- }
--
-diff --git a/package/expat/expat.hash b/package/expat/expat.hash
-index b8e7aa27f1..15e64a4dc8 100644
---- a/package/expat/expat.hash
-+++ b/package/expat/expat.hash
-@@ -1,7 +1,7 @@
--# From https://sourceforge.net/projects/expat/files/expat/2.4.8/
--md5 0584a7318a4c007f7ec94778799d72fe expat-2.4.8.tar.xz
--sha1 e30345a20d0cc29a0c307eb3703e7a9bb62afa90 expat-2.4.8.tar.xz
-+# From https://sourceforge.net/projects/expat/files/expat/2.4.9/
-+md5 8d7fcf7d02d08bf79d9ae5c21cc72c03 expat-2.4.9.tar.xz
-+sha1 be91118bc495ce49b04a3fd0f27df2fb5a843e9b expat-2.4.9.tar.xz
-
- # Locally calculated
--sha256 f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 expat-2.4.8.tar.xz
--sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
-+sha256 6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354 expat-2.4.9.tar.xz
-+sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING
-diff --git a/package/expat/expat.mk b/package/expat/expat.mk
-index 61735a5fdb..59854d0ee8 100644
---- a/package/expat/expat.mk
-+++ b/package/expat/expat.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
-
--EXPAT_VERSION = 2.4.8
-+EXPAT_VERSION = 2.4.9
- EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
- EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
- EXPAT_INSTALL_STAGING = YES
-@@ -13,9 +13,6 @@ EXPAT_LICENSE_FILES = COPYING
- EXPAT_CPE_ID_VENDOR = libexpat_project
- EXPAT_CPE_ID_PRODUCT = libexpat
-
--# 0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
--EXPAT_IGNORE_CVES += CVE-2022-40674
--
- EXPAT_CONF_OPTS = \
- --without-docbook --without-examples --without-tests --without-xmlwf
- HOST_EXPAT_CONF_OPTS = --without-docbook --without-examples --without-tests
---
-2.35.1
-
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 591e26962..30bdbf58f 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -25,9 +25,6 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
-rm -rf buildroot/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
-rm -rf buildroot/package/expat/expat.hash
-rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/gnokii/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-10-19 15:20:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 78d941903ae11f78cf4769989368571f2bda53cd (commit)
from 3dab76a8a108c02fe40fe40f49b25e6da4813222 (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 78d941903ae11f78cf4769989368571f2bda53cd
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Oct 19 17:16:45 2022 +0200
[BUILDROOT] 2022.02: patch to reduce imx-gpu-viv disk usage
-----------------------------------------------------------------------
Summary of changes:
...escale-imx-imx-gpu-viv-removes-uneeded-li.patch | 85 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 1 +
2 files changed, 86 insertions(+)
create mode 100644 patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
diff --git a/patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch b/patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
new file mode 100644
index 000000000..22d84e433
--- /dev/null
+++ b/patches/buildroot/2022.02/417-package-freescale-imx-imx-gpu-viv-removes-uneeded-li.patch
@@ -0,0 +1,85 @@
+From f2bf96a97545442a7d878309fcd3277f5b716770 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 19 Oct 2022 15:55:18 +0200
+Subject: [PATCH 1/1] package/freescale-imx/imx-gpu-viv: removes uneeded
+ library files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On aarch64, imx-gpu-viv package contains libraries related to
+neuronal network programming that took about 150MB of space...
+Only install libraries needed for the selected i.MX platform.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 45 +++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+index 3c88b8b11e..1e6e2dac1b 100644
+--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
++++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+@@ -63,6 +63,50 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG
+ endef
+ endif
+
++ifeq ($(BR2_aarch64),y)
++IMX_GPU_VIV_LIBNN_FILES = libNNGPUBinary-evis2.so \
++ libNNGPUBinary-evis.so \
++ libNNGPUBinary-lite.so \
++ libNNGPUBinary-nano.so \
++ libNNGPUBinary-ulite.so \
++ libNNVXCBinary-evis2.so \
++ libNNVXCBinary-evis.so \
++ libOvx12VXCBinary-evis2.so \
++ libOvx12VXCBinary-evis.so
++
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
++define IMX_GPU_VIV_REMOVE_LIBNN_FILES
++ $(foreach lib,$(filter-out libNNGPUBinary-evis.so libNNVXCBinary-evis.so libOvx12VXCBinary-evis.so,$(IMX_GPU_VIV_LIBNN_FILES)), \
++ $(RM) -f $(@D)/gpu-core/usr/lib/$(lib)
++ )
++endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
++define IMX_GPU_VIV_REMOVE_LIBNN_FILES
++ $(foreach lib,$(filter-out libNNGPUBinary-lite.so,$(IMX_GPU_VIV_LIBNN_FILES)), \
++ $(RM) -f $(@D)/gpu-core/usr/lib/$(lib)
++ )
++endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y)
++define IMX_GPU_VIV_REMOVE_LIBNN_FILES
++ $(foreach lib,$(IMX_GPU_VIV_LIBNN_FILES), \
++ $(RM) -f $(@D)/gpu-core/usr/lib/$(lib)
++ )
++endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y)
++define IMX_GPU_VIV_REMOVE_LIBNN_FILES
++ $(foreach lib,$(filter-out libNNGPUBinary-ulite.so,$(IMX_GPU_VIV_LIBNN_FILES)), \
++ $(RM) -f $(@D)/gpu-core/usr/lib/$(lib)
++ )
++endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y)
++define IMX_GPU_VIV_REMOVE_LIBNN_FILES
++ $(foreach lib,$(filter-out libNNGPUBinary-evis2.so libNNVXCBinary-evis2.so libOvx12VXCBinary-evis2.so, $(IMX_GPU_VIV_LIBNN_FILES)), \
++ $(RM) -f $(@D)/gpu-core/usr/lib/$(lib)
++ )
++endef
++endif
++endif
++
+ # Instead of building, we fix up the inconsistencies that exist
+ # in the upstream archive here. We also remove unused backend files.
+ # Make sure these commands are idempotent.
+@@ -72,6 +116,7 @@ define IMX_GPU_VIV_BUILD_CMDS
+ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend)
+ )
+ $(IMX_GPU_VIV_FIXUP_PKGCONFIG)
++ $(IMX_GPU_VIV_REMOVE_LIBNN_FILES)
+ endef
+
+ define IMX_GPU_VIV_INSTALL_STAGING_CMDS
+--
+2.37.3
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index d53cab38b..591e26962 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -29,6 +29,7 @@ rm -rf buildroot/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-interna
rm -rf buildroot/package/expat/expat.hash
rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
+rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
rm -rf buildroot/package/gpsd/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-10-17 15:14:32
|
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 3dab76a8a108c02fe40fe40f49b25e6da4813222 (commit)
from 22fdee23e3a09765ac4c704e1a312960bac3e7a4 (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 3dab76a8a108c02fe40fe40f49b25e6da4813222
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Oct 17 17:14:11 2022 +0200
[DEMOS] Capture: fix RGB24 to RGB32 conversion and add RGB565 to RGB32
-----------------------------------------------------------------------
Summary of changes:
target/demos/camera/capture/capture.c | 45 ++++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index db46a930e..781caf481 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -356,21 +356,48 @@ static void yuv420_to_rgb(void *yuv, int size, void *rgb, int bpp)
}
}
-static void rgb_to_rgb(void *rgb_src, int size, void *rgb_dst, int bpp)
+static void rgb24_to_rgb(void *rgb_src, int size, void *rgb_dst, int bpp)
{
- Uint32 *dest32 = (Uint32*) rgb_dst;
+ Uint32 *dest32 = (Uint32*)rgb_dst;
Uint8 *src = (Uint8 *)rgb_src;
int i, pos = 0;
Uint8 R, G, B, A;
Uint32 color;
if (bpp == 32) {
- for (i=size/4; i; i--) {
+ for (i = size/4; i; i--) {
R = src[pos++];
G = src[pos++];
B = src[pos++];
- A = 0xff;
- *dest32++ = (A << 24) | (R << 16) | (G << 8) | B;
+ *dest32++ = (R << 16) | (G << 8) | B;
+ }
+ } else {
+ fprintf(stdout, "%s: unsupported screen bpp (%d)\n", __func__, bpp);
+ }
+}
+
+static void rgb565_to_rgb(void *rgb_src, int size, void *rgb_dst, int bpp)
+{
+ Uint32 *dest32 = (Uint32*)rgb_dst;
+ Uint16 *src = (Uint16 *)rgb_src;
+ int i, pos = 0;
+ Uint8 R, G, B, A;
+ Uint16 pixel;
+ static int first_time = 1;
+
+ if (first_time) {
+ fprintf(stdout, "%s: image size %d\n", __func__, size);
+ first_time = 0;
+ }
+
+ if (bpp == 32) {
+ for (i = size/2; i; i--) {
+ pixel = src[pos];
+ B = pixel >> 8;
+ G = (pixel & 0x07e0) >> 3;
+ R = (pixel & 0x1f) << 3;
+ *dest32++ = (R << 16) | (G << 8) | B;
+ pos++;
}
} else {
fprintf(stdout, "%s: unsupported screen bpp (%d)\n", __func__, bpp);
@@ -460,11 +487,11 @@ static void process_image(/*const */void *pCaptured, int size)
} else if (mycamera.pixelformat == V4L2_PIX_FMT_YUV420) {
yuv420_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_RGB24) {
- rgb_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
+ rgb24_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
+ } else if (mycamera.pixelformat == V4L2_PIX_FMT_RGB565) {
+ rgb565_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else {
- if ( (mycamera.pixelformat != V4L2_PIX_FMT_RGB565)
- && (mycamera.pixelformat != V4L2_PIX_FMT_RGB32) )
- {
+ if (mycamera.pixelformat != V4L2_PIX_FMT_RGB32) {
if (first_time) {
printf("Unknown camera image format (%c%c%c%c)!!\n", FOURCC_TO_STR(mycamera.pixelformat));
first_time = 0;
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-10-07 13:00: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 22fdee23e3a09765ac4c704e1a312960bac3e7a4 (commit)
from 16392f171a97b2edfbe0c4f815b716fbb7bca3b3 (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 22fdee23e3a09765ac4c704e1a312960bac3e7a4
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Oct 7 14:56:44 2022 +0200
[BUILDROOT] 2022.02: patches to fix expat downloading
Bump to expat 2.4.9
-----------------------------------------------------------------------
Summary of changes:
.../416-package-expat-bump-to-version-2.4.9.patch | 123 +++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 3 +
2 files changed, 126 insertions(+)
create mode 100644 patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
diff --git a/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch b/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
new file mode 100644
index 000000000..ceac53ed4
--- /dev/null
+++ b/patches/buildroot/2022.02/416-package-expat-bump-to-version-2.4.9.patch
@@ -0,0 +1,123 @@
+From f7772a54dbe49f1ee052d7a071113861a410e172 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Wed, 21 Sep 2022 23:07:33 +0200
+Subject: [PATCH 1/1] package/expat: bump to version 2.4.9
+
+- Drop patch (akready in version)
+- Update hash of COPYING (year updated with
+ https://github.com/libexpat/libexpat/commit/39b2e99355039626438d48a4eca6aacba2b44d5e)
+
+https://blog.hartwork.org/posts/expat-2-4-9-released
+https://github.com/libexpat/libexpat/blob/R_2_4_9/expat/Changes
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...re-safe-exiting-internalEntityParser.patch | 53 -------------------
+ package/expat/expat.hash | 10 ++--
+ package/expat/expat.mk | 5 +-
+ 3 files changed, 6 insertions(+), 62 deletions(-)
+ delete mode 100644 package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
+
+diff --git a/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch b/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
+deleted file mode 100644
+index ca86e85115..0000000000
+--- a/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
++++ /dev/null
+@@ -1,53 +0,0 @@
+-From 4a32da87e931ba54393d465bb77c40b5c33d343b Mon Sep 17 00:00:00 2001
+-From: Rhodri James <rh...@wi...>
+-Date: Wed, 17 Aug 2022 18:26:18 +0100
+-Subject: [PATCH] Ensure raw tagnames are safe exiting internalEntityParser
+-
+-It is possible to concoct a situation in which parsing is
+-suspended while substituting in an internal entity, so that
+-XML_ResumeParser directly uses internalEntityProcessor as
+-its processor. If the subsequent parse includes some unclosed
+-tags, this will return without calling storeRawNames to ensure
+-that the raw versions of the tag names are stored in memory other
+-than the parse buffer itself. If the parse buffer is then changed
+-or reallocated (for example if processing a file line by line),
+-badness will ensue.
+-
+-This patch ensures storeRawNames is always called when needed
+-after calling doContent. The earlier call do doContent does
+-not need the same protection; it only deals with entity
+-substitution, which cannot leave unbalanced tags, and in any
+-case the raw names will be pointing into the stored entity
+-value not the parse buffer.
+-
+-[Retrieved from:
+-https://github.com/libexpat/libexpat/commit/4a32da87e931ba54393d465bb77c40b5c33d343b]
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+----
+- expat/lib/xmlparse.c | 13 +++++++++----
+- 1 file changed, 9 insertions(+), 4 deletions(-)
+-
+-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
+-index 7bcabf7f4..d73f419cf 100644
+---- a/lib/xmlparse.c
+-+++ b/lib/xmlparse.c
+-@@ -5826,10 +5826,15 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,
+- {
+- parser->m_processor = contentProcessor;
+- /* see externalEntityContentProcessor vs contentProcessor */
+-- return doContent(parser, parser->m_parentParser ? 1 : 0, parser->m_encoding,
+-- s, end, nextPtr,
+-- (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+-- XML_ACCOUNT_DIRECT);
+-+ result = doContent(parser, parser->m_parentParser ? 1 : 0,
+-+ parser->m_encoding, s, end, nextPtr,
+-+ (XML_Bool)! parser->m_parsingStatus.finalBuffer,
+-+ XML_ACCOUNT_DIRECT);
+-+ if (result == XML_ERROR_NONE) {
+-+ if (! storeRawNames(parser))
+-+ return XML_ERROR_NO_MEMORY;
+-+ }
+-+ return result;
+- }
+- }
+-
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index b8e7aa27f1..15e64a4dc8 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.4.8/
+-md5 0584a7318a4c007f7ec94778799d72fe expat-2.4.8.tar.xz
+-sha1 e30345a20d0cc29a0c307eb3703e7a9bb62afa90 expat-2.4.8.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.4.9/
++md5 8d7fcf7d02d08bf79d9ae5c21cc72c03 expat-2.4.9.tar.xz
++sha1 be91118bc495ce49b04a3fd0f27df2fb5a843e9b expat-2.4.9.tar.xz
+
+ # Locally calculated
+-sha256 f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 expat-2.4.8.tar.xz
+-sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
++sha256 6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354 expat-2.4.9.tar.xz
++sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index 61735a5fdb..59854d0ee8 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.4.8
++EXPAT_VERSION = 2.4.9
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+@@ -13,9 +13,6 @@ EXPAT_LICENSE_FILES = COPYING
+ EXPAT_CPE_ID_VENDOR = libexpat_project
+ EXPAT_CPE_ID_PRODUCT = libexpat
+
+-# 0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
+-EXPAT_IGNORE_CVES += CVE-2022-40674
+-
+ EXPAT_CONF_OPTS = \
+ --without-docbook --without-examples --without-tests --without-xmlwf
+ HOST_EXPAT_CONF_OPTS = --without-docbook --without-examples --without-tests
+--
+2.35.1
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 985b411d3..d53cab38b 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -25,6 +25,9 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expat/0001-Ensure-raw-tagnames-are-safe-exiting-internalEntityParser.patch
+rm -rf buildroot/package/expat/expat.hash
+rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-10-07 09:13:38
|
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 16392f171a97b2edfbe0c4f815b716fbb7bca3b3 (commit)
from 24292033909bf009c600aca1da338662a7da4a2e (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 16392f171a97b2edfbe0c4f815b716fbb7bca3b3
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Oct 7 11:10:00 2022 +0200
[BUILDROOT] Bump BR to 2022.02.6
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../2022.02/415-package-rt-tests-bump-version-to-2.4.patch | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 0e6523415..dd16dae18 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 5
+BUILDROOT_MINOR_VERSION ?= 6
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch b/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
index 5a5eebca5..c7288580c 100644
--- a/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
+++ b/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
@@ -1,4 +1,4 @@
-From f9bacf348a9529fb9c926129687bafa55a6d9d12 Mon Sep 17 00:00:00 2001
+From d889bdc9b327203f75a31350f49b21e9da08b495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
<seb...@ar...>
Date: Mon, 18 Jul 2022 10:43:34 +0200
@@ -14,15 +14,15 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash
-index 4f84e0d0ca..1c5071fc63 100644
+index 3adda60f42..49df8313f9 100644
--- a/package/rt-tests/rt-tests.hash
+++ b/package/rt-tests/rt-tests.hash
@@ -1,4 +1,4 @@
# From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc
--sha256 b5e7959bcb5c703b2743030751af975ea4e04962e29fc1118f4b605987585735 rt-tests-2.3.tar.xz
-+sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz
+-sha256 b5e7959bcb5c703b2743030751af975ea4e04962e29fc1118f4b605987585735 rt-tests-2.3.tar.xz
++sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz
# locally computed hash
- sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
+ sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 056a4a6723..74290211ce 100644
--- a/package/rt-tests/rt-tests.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-09-30 11:16:03
|
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 24292033909bf009c600aca1da338662a7da4a2e (commit)
from 8f6d5e6a7d225ae9a63533da126bd58d69cadce5 (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 24292033909bf009c600aca1da338662a7da4a2e
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Sep 30 13:15:47 2022 +0200
[BUILDROOT] gst1: add debugutils to have fpsdisplaysink in all configs using gstreamer
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 1 +
buildroot/configs/apf6legacy-4.1_defconfig | 1 +
buildroot/configs/apf6mainline-4.9_defconfig | 1 +
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ullegacy-4.1_defconfig | 1 +
buildroot/configs/opos8mm-legacy-5.10_defconfig | 1 +
buildroot/configs/opos8mm-legacy-5.4_defconfig | 1 +
7 files changed, 7 insertions(+)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 6a2e5beb7..aa126d165 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -74,6 +74,7 @@ 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_CAMERABIN2=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index 02f2067b4..2fc75fb8a 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -77,6 +77,7 @@ BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index 9134002cf..08197c252 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -77,6 +77,7 @@ BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLORSPACE=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_H264PARSE=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index aaf55c6d9..7ef6f9547 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -56,6 +56,7 @@ 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_BAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
BR2_PACKAGE_GST1_LIBAV=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index d70afb31b..98ef31f85 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -79,6 +79,7 @@ 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_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index f0af3d0f4..faf63a2b0 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -63,6 +63,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 57bab1502..9a3c2adef 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -62,6 +62,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
BR2_PACKAGE_GST1_LIBAV=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-09-27 15:46: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 8f6d5e6a7d225ae9a63533da126bd58d69cadce5 (commit)
from 4e488ac5d69113ce30f9a1f80f9177f944d76b51 (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 8f6d5e6a7d225ae9a63533da126bd58d69cadce5
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 27 17:33:23 2022 +0200
[BUILD] Makefile.in: fix libc library name detection
It was broken for ages...
Use BR2_TOOLCHAIN_USES_{UCLIBC,MUSL,GLIBC} macro and drop libc version.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 1 -
Makefile.in | 13 ++++---------
scripts/show_build_infos.sh | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 3a0947778..0e6523415 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,6 @@ shell_env:
@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_GCC_VERSION=$(ARMADEUS_GCC_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LIBC_NAME=$(ARMADEUS_LIBC_NAME) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_LIBC_VERSION=$(ARMADEUS_LIBC_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BUSYBOX_VERSION=$(ARMADEUS_BUSYBOX_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index cc8b995ce..1a9915873 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,16 +39,11 @@ ARMADEUS_LINUX_MAIN_VERSION:=$(shell echo $(ARMADEUS_LINUX_VERSION) | cut -d . -
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
ARMADEUS_U_BOOT_CUSTOM_VERSION = $(shell echo $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) | awk '{ print substr( $$0, length($$0) - 6, 7 ) }')
ARMADEUS_LIBC_NAME=unknown
-ARMADEUS_LIBC_VERSION=X.Y
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
ARMADEUS_LIBC_NAME=uClibc
-ARMADEUS_LIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
-endif
-ifeq ($(BR2_TOOLCHAIN_CTNG),y)
-ARMADEUS_LIBC_NAME:=$(BR2_TOOLCHAIN_CTNG_LIBC)
-ARMADEUS_LIBC_VERSION:=$(shell grep CT_LIBC_VERSION $(BUILDROOT_DIR)/$(BR2_TOOLCHAIN_CTNG_CONFIG) | cut -d = -f 2)
-endif
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+ARMADEUS_LIBC_NAME=musl
+else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
ARMADEUS_LIBC_NAME=glibc
endif
diff --git a/scripts/show_build_infos.sh b/scripts/show_build_infos.sh
index d1ddba0ae..e2b9c9890 100755
--- a/scripts/show_build_infos.sh
+++ b/scripts/show_build_infos.sh
@@ -14,7 +14,7 @@ echo ""
echo "Your Armadeus BSP (version "$ARMADEUS_BSP_VERSION" for "$ARMADEUS_BOARD_NAME") was successfully built !"
echo " Buildroot: "$ARMADEUS_BUILDROOT_VERSION""
echo " gcc: "$ARMADEUS_GCC_VERSION""
-echo " libc: "$ARMADEUS_LIBC_NAME $ARMADEUS_LIBC_VERSION""
+echo " libc: "$ARMADEUS_LIBC_NAME""
echo " busybox: "$ARMADEUS_BUSYBOX_VERSION""
echo " U-Boot: "$ARMADEUS_U_BOOT_VERSION""
echo " Linux: "$ARMADEUS_LINUX_VERSION""
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-09-21 07:53:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4e488ac5d69113ce30f9a1f80f9177f944d76b51 (commit)
via c0d2d0b9cb59583e2965a0872c7b1622d3919859 (commit)
via b9ab3b5dbf71af124ab62163a8c3a94a7356742f (commit)
from 48145849b7b82f2786ff7bcb92d1be9a24d450ce (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 4e488ac5d69113ce30f9a1f80f9177f944d76b51
Merge: 48145849b c0d2d0b9c
Author: Kevin JOLY <kev...@po...>
Date: Wed Sep 21 07:53:14 2022 +0000
Merge branch 'improve-ci' into 'master'
Improve ci
See merge request armadeus/armadeus-bsp!2
commit c0d2d0b9cb59583e2965a0872c7b1622d3919859
Author: Kevin Joly <kev...@ar...>
Date: Tue Sep 20 11:55:42 2022 +0200
Keep artifacts only for scheduled pipelines
commit b9ab3b5dbf71af124ab62163a8c3a94a7356742f
Author: Kevin Joly <kev...@ar...>
Date: Tue Sep 20 11:21:35 2022 +0200
Do not build docker image
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30a02fcca..4bebe4dda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,27 +11,12 @@ variables:
DOCKER_TLS_CERTDIR: "/certs"
stages:
- - docker build
- build
-services:
- - docker:20.10.16-dind
-
-docker build:
- stage: docker build
- script:
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker build -t registry.gitlab.com/armadeus/armadeus-bsp docker
- - docker push registry.gitlab.com/armadeus/armadeus-bsp
- rules:
- - if: $CI_PIPELINE_SOURCE != "merge_request_event"
- changes:
- - docker/Dockerfile
-
-build:
+.build_template:
+ stage: build
image:
name: registry.gitlab.com/armadeus/armadeus-bsp:latest
- stage: build
cache:
key: armadeus-bsp-packages
paths:
@@ -44,6 +29,16 @@ build:
matrix:
- ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
timeout: 4h
+
+build:
+ except:
+ - schedules
+ extends: .build_template
+
+build-weekly:
+ only:
+ - schedules
+ extends: .build_template
artifacts:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
paths:
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-09-05 09:37: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 48145849b7b82f2786ff7bcb92d1be9a24d450ce (commit)
from a49c5fb245a6c1327e5565becced008dd6dbbc0c (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 48145849b7b82f2786ff7bcb92d1be9a24d450ce
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Sep 5 11:34:10 2022 +0200
[BUILDROOT] Bump BR to 2022.02.5
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f5191d6a1..3a0947778 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 4
+BUILDROOT_MINOR_VERSION ?= 5
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-08-01 13:49:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a49c5fb245a6c1327e5565becced008dd6dbbc0c (commit)
via 8071a32c5330041cc33ecd0d584a7204ccf3065a (commit)
from 220e7de748be08c2c4f2a3b5d72fd5768c63e3fb (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 a49c5fb245a6c1327e5565becced008dd6dbbc0c
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Aug 1 15:39:40 2022 +0200
[BUILDROOT] Bump BR to 2022.02.4
commit 8071a32c5330041cc33ecd0d584a7204ccf3065a
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 26 16:20:27 2022 +0200
[BUILDROOT] opos6ul_defconfig: increase rootfs size to 180MB
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index d767b410d..f5191d6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 3
+BUILDROOT_MINOR_VERSION ?= 4
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 483a17124..aaf55c6d9 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -149,7 +149,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="160M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="180M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
hooks/post-receive
--
armadeus
|