armadeus-commitlog Mailing List for armadeus (Page 12)
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
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2020-10-20 17:18: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 f3749715387fd4db8c308d71858f6a0e836bbe41 (commit)
via e15fb29a476c1057e78e8b258315a97961dd8e4e (commit)
from da799424b02ddff647de382b6e8a514c37f68ecb (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 f3749715387fd4db8c308d71858f6a0e836bbe41
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 20 19:17:53 2020 +0200
[BUILDROOT] opos8mm: enable can-utils and gesftpserver
commit e15fb29a476c1057e78e8b258315a97961dd8e4e
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 20 19:16:09 2020 +0200
[BUILDROOT] opos8mm: fix BR_DL_DIR and enable ccache
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.4_defconfig | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 24f491a5b..dfa75b987 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -1,6 +1,8 @@
BR2_aarch64=y
-BR2_DL_DIR="/home/sszy/development/buildroot-download"
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_HOSTNAME="opos8mm"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -86,8 +88,10 @@ BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y
BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI=y
BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC=y
BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP=y
+BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_GESFTPSERVER=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_LINKS=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-10-20 08:30:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via da799424b02ddff647de382b6e8a514c37f68ecb (commit)
from ea4b0713205d206cf3a1fa821161a5d86882142c (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 da799424b02ddff647de382b6e8a514c37f68ecb
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 20 10:28:41 2020 +0200
[BSP] OPOS8MM: enable RTC (on I2C bus)
-----------------------------------------------------------------------
Summary of changes:
.../opos8mm/opos8mm-linux-legacy-5.4_defconfig | 8 +--
...-dts-imx8mm-opos8mm-enable-RTC-on-I2C-bus.patch | 62 ++++++++++++++++++++++
2 files changed, 63 insertions(+), 7 deletions(-)
create mode 100644 patches/linux/5.4.imx_legacy/0521-arm64-dts-imx8mm-opos8mm-enable-RTC-on-I2C-bus.patch
diff --git a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
index 8fa9ef617..ea73540ef 100644
--- a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
+++ b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
@@ -499,13 +499,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
CONFIG_EDAC=y
CONFIG_EDAC_GHES=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_PCF85363=y
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_DS3232=y
-CONFIG_RTC_DRV_PCF2127=y
-CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_PCF85063=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_RTC_DRV_IMX_SC=y
CONFIG_DMADEVICES=y
diff --git a/patches/linux/5.4.imx_legacy/0521-arm64-dts-imx8mm-opos8mm-enable-RTC-on-I2C-bus.patch b/patches/linux/5.4.imx_legacy/0521-arm64-dts-imx8mm-opos8mm-enable-RTC-on-I2C-bus.patch
new file mode 100644
index 000000000..8113efd28
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0521-arm64-dts-imx8mm-opos8mm-enable-RTC-on-I2C-bus.patch
@@ -0,0 +1,62 @@
+From e052c1193926ff3612b9bab86398714fa7d1c58b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 20 Oct 2020 10:11:01 +0200
+Subject: [PATCH 521/521] arm64: dts: imx8mm-opos8mm: enable RTC (on I2C bus)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../boot/dts/freescale/imx8mm-opos8mm.dtsi | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
+index 2b54193bf944..064d4f9ac512 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mm.dtsi
+@@ -5,6 +5,11 @@
+ #include "imx8mm.dtsi"
+
+ / {
++ aliases {
++ rtc0 = &pcf85063a;
++ rtc1 = &snvs_rtc;
++ };
++
+ memory@40000000 {
+ reg = <0x00000000 0x4000000 0 0>; /* will be filled by U-Boot */
+ device_type = "memory";
+@@ -222,6 +227,15 @@
+ };
+ };
+ };
++
++ pcf85063a: rtc@51 {
++ compatible = "nxp,pcf85063a";
++ reg = <0x51>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_rtc>;
++ interrupt-parent = <&gpio3>;
++ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
++ };
+ };
+
+ &wdog1 {
+@@ -343,6 +357,12 @@
+ >;
+ };
+
++ pinctrl_rtc: rtcgrp {
++ fsl,pins = <
++ MX8MM_IOMUXC_NAND_CE1_B_GPIO3_IO2 0x90
++ >;
++ };
++
+ pinctrl_wdog: wdoggrp {
+ fsl,pins = <
+ MX8MM_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0x92
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-10-16 16:15:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ea4b0713205d206cf3a1fa821161a5d86882142c (commit)
from 4f9a06dcca29764edd643c9f6e3592d5644f148f (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 ea4b0713205d206cf3a1fa821161a5d86882142c
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Oct 16 18:13:47 2020 +0200
[BSP] OPOS8MMDev: enable PCIe
-----------------------------------------------------------------------
Summary of changes:
.../opos8mm/opos8mm-linux-legacy-5.4_defconfig | 1 -
...8-arm64-dts-imx8mm-opos8mmdev-enable-PCIe.patch | 30 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 patches/linux/5.4.imx_legacy/0518-arm64-dts-imx8mm-opos8mmdev-enable-PCIe.patch
diff --git a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
index 0e4d89e04..8fa9ef617 100644
--- a/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
+++ b/buildroot/target/device/armadeus/opos8mm/opos8mm-linux-legacy-5.4_defconfig
@@ -160,7 +160,6 @@ CONFIG_PCI_IOV=y
CONFIG_PCI_PRI=y
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_PCIE_DW_PLAT_HOST=y
CONFIG_PCI_IMX6=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
diff --git a/patches/linux/5.4.imx_legacy/0518-arm64-dts-imx8mm-opos8mmdev-enable-PCIe.patch b/patches/linux/5.4.imx_legacy/0518-arm64-dts-imx8mm-opos8mmdev-enable-PCIe.patch
new file mode 100644
index 000000000..00f70cdee
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0518-arm64-dts-imx8mm-opos8mmdev-enable-PCIe.patch
@@ -0,0 +1,30 @@
+From 2ac009b5515dac66c83e8f45274d0709b0dfa49f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 16 Oct 2020 18:04:14 +0200
+Subject: [PATCH 518/519] arm64: dts: imx8mm-opos8mmdev: enable PCIe
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+index f58211b15189..daceb62cf1d9 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+@@ -185,7 +185,7 @@
+ clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
+ ext_osc = <0>;
+ reserved-region = <&rpmsg_reserved>;
+- //status = "okay";
++ status = "okay";
+ };
+
+ &sai5 {
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-10-13 13:41:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, armadeus-2020.07 has been updated
via 648e57ce6d2cae60f018a4fd83eceb4c3e0ad848 (commit)
from d6d02af214540d67e195729581c1f5dd5d38cb95 (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 648e57ce6d2cae60f018a4fd83eceb4c3e0ad848
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 13 15:38:44 2020 +0200
opos8mmdev.h: rootfs on part 2, fix partition offsets
-----------------------------------------------------------------------
Summary of changes:
include/configs/opos8mmdev.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/opos8mmdev.h b/include/configs/opos8mmdev.h
index 0c372af850..771c010971 100644
--- a/include/configs/opos8mmdev.h
+++ b/include/configs/opos8mmdev.h
@@ -96,8 +96,8 @@
"stdout=serial\0" \
"stderr=serial\0" \
"mmcdev=0\0" \
- "mmcpart=1\0" \
- "mmcroot=/dev/mmcblk0p1 ro\0" \
+ "mmcpart=2\0" \
+ "mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
"kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
"splashpos=0,0\0" \
@@ -154,7 +154,7 @@
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0x40800 ${nbblocks}; then " \
+ "if mmc write ${loadaddr} 0x100800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
@@ -187,8 +187,8 @@
"mw ${loadaddr} 0 0x200000; " \
"mmc write ${loadaddr} 0 0x1000; " \
"mmc write ${loadaddr} 0x800 0x1000; " \
- "mmc write ${loadaddr} 0x40800 0x1000; " \
- "mmc write ${loadaddr} 0x440800 0x1000; " \
+ "mmc write ${loadaddr} 0x100800 0x1000; " \
+ "mmc write ${loadaddr} 0x200800 0x1000; " \
"fi;" \
"mmc rescan\0" \
"update_all=run update_rootfs update_uboot\0" \
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-10-13 10:10:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0ee41e4cbdce1df8b6b932a1dc75e61271c4b28a (commit)
from 6fba4d59cc6c0fed09b0008e5119538ebec8a7bd (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 0ee41e4cbdce1df8b6b932a1dc75e61271c4b28a
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 13 12:08:35 2020 +0200
[BUILDROOT] opos6ul{,nano,sp} / apf6: bump kernel to 4.19.150
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index fc8f2e77b..e23b9d2fe 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="4.19.117"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.150"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index e1bac9e2a..49597cb55 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.117"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.150"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 3c57886f1..e58312c8b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.117"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.150"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index a4dc3367a..600cf7566 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.117"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.150"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-10-13 09:45:18
|
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 "UNNAMED PROJECT".
The branch, armadeus-2020.07 has been updated
via d6d02af214540d67e195729581c1f5dd5d38cb95 (commit)
from 5fbc9045e06db12cea22e4fa8a12e627cf707bd4 (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 d6d02af214540d67e195729581c1f5dd5d38cb95
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 13 11:44:43 2020 +0200
opos8mmdev.h: put back addmmcargs and emmcboot scripts
-----------------------------------------------------------------------
Summary of changes:
include/configs/opos8mmdev.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/configs/opos8mmdev.h b/include/configs/opos8mmdev.h
index dc61b6174f..0c372af850 100644
--- a/include/configs/opos8mmdev.h
+++ b/include/configs/opos8mmdev.h
@@ -195,6 +195,12 @@
"initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
+ "rootfstype=${mmcrootfstype}\0" \
+ "emmcboot=run initargs; run addmmcargs; " \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/${kernelimg} && " \
+ "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/imx8mm-${fdt_name}.dtb && " \
+ "booti ${loadaddr} - ${fdt_addr};\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=run initargs; run addnfsargs addipargs; " \
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-10-09 14:46:08
|
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 "UNNAMED PROJECT".
The branch, armadeus-2020.07 has been updated
via 5fbc9045e06db12cea22e4fa8a12e627cf707bd4 (commit)
from 4382548de6357342bca830dfe1fd0919cd04d9da (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 5fbc9045e06db12cea22e4fa8a12e627cf707bd4
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Oct 9 16:45:35 2020 +0200
opos8mmdev_defconfig: update and add ethernet support
-----------------------------------------------------------------------
Summary of changes:
configs/opos8mmdev_defconfig | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configs/opos8mmdev_defconfig b/configs/opos8mmdev_defconfig
index ea215d3289..59acaaa3a3 100644
--- a/configs/opos8mmdev_defconfig
+++ b/configs/opos8mmdev_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_I2C_MXC_I2C2=y
CONFIG_SYS_I2C_MXC_I2C3=y
CONFIG_SYS_I2C_MXC_I2C4=y
CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x7E1000
CONFIG_TARGET_OPOS8MMDEV=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
@@ -20,7 +21,6 @@ CONFIG_SPL_STACK_R_ADDR=0x5FFFFC00
CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0x4000
-CONFIG_SPL_TEXT_BASE=0x7E1000
CONFIG_FIT=y
CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_SPL_LOAD_FIT=y
@@ -104,7 +104,14 @@ CONFIG_SPL_MMC_HS400_ES_SUPPORT=y
CONFIG_MMC_HS400_SUPPORT=y
CONFIG_SPL_MMC_HS400_SUPPORT=y
CONFIG_FSL_USDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_PHY_GIGE=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
+CONFIG_MII=y
CONFIG_PINCTRL=y
# CONFIG_PINCTRL_GENERIC is not set
# CONFIG_PINCONF_RECURSIVE is not set
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-07-31 07:26:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, armadeus-2020.07 has been updated
via 634601b5c443b5827de2442cdad7292649a9176e (commit)
from e7396a82ff30bf4b15515e94379d0442f957b29c (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 634601b5c443b5827de2442cdad7292649a9176e
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jul 31 09:25:22 2020 +0200
tools: imx8m_image: don't use <<< redirection
It does not work on Dash (Ubuntu default shell)
-----------------------------------------------------------------------
Summary of changes:
tools/imx8m_image.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh
index fef8814ddf..67fcbf4050 100755
--- a/tools/imx8m_image.sh
+++ b/tools/imx8m_image.sh
@@ -30,7 +30,7 @@ for f in $blobs; do
done
if [ $post_process = 1 ]; then
- if grep -q 'lpddr4_' <<< $blobs; then
+ if echo "$blobs" | grep -q 'lpddr4_'; then
objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin
objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Fabien M <fa...@us...> - 2020-07-23 13:58: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 6fba4d59cc6c0fed09b0008e5119538ebec8a7bd (commit)
via 7d97ccf6c5eb681972c425859d194829d9e7cd37 (commit)
from 5a2d1cee377f80e2add2501c5793820ab747923d (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 6fba4d59cc6c0fed09b0008e5119538ebec8a7bd
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 23 15:58:31 2020 +0200
[GATEWARE] useless reset signal
commit 7d97ccf6c5eb681972c425859d194829d9e7cd37
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 23 15:58:06 2020 +0200
[GATEWARE](FIRMWARE) adding verilog version for blinking led
-----------------------------------------------------------------------
Summary of changes:
firmware/leds/blinking_led/src/spartan/led_blink.v | 27 ++++++++++++++++++++++
.../leds/blinking_led/src/spartan/led_blink.vhd | 7 +-----
2 files changed, 28 insertions(+), 6 deletions(-)
create mode 100644 firmware/leds/blinking_led/src/spartan/led_blink.v
diff --git a/firmware/leds/blinking_led/src/spartan/led_blink.v b/firmware/leds/blinking_led/src/spartan/led_blink.v
new file mode 100644
index 000000000..64017000b
--- /dev/null
+++ b/firmware/leds/blinking_led/src/spartan/led_blink.v
@@ -0,0 +1,27 @@
+module Clk_div_led (
+ input Clk,
+ output led_cathode,
+ output reg led_anode
+);
+
+ localparam max_count = 48000000;
+
+ reg [$clog2(max_count)-1:0] count;
+ assign led_cathode = 1'b0;
+
+ always@(posedge Clk) begin
+ if(count < max_count/2) begin
+ led_anode <= 1'b1;
+ count <= count + 1'b1;
+ end
+ else if(count < max_count) begin
+ led_anode <= 1'b0;
+ count <= count + 1'b1;
+ end
+ else begin
+ count <= 0;
+ led_anode <= 1'b1;
+ end
+ end
+
+endmodule
diff --git a/firmware/leds/blinking_led/src/spartan/led_blink.vhd b/firmware/leds/blinking_led/src/spartan/led_blink.vhd
index 8c4e062d8..7293148b6 100644
--- a/firmware/leds/blinking_led/src/spartan/led_blink.vhd
+++ b/firmware/leds/blinking_led/src/spartan/led_blink.vhd
@@ -24,20 +24,15 @@ end Clk_div_led;
architecture RTL of Clk_div_led is
constant max_count : natural := 48000000;
-- constant max_count : natural := 10000;
- signal Rst_n : std_logic;
begin
- Rst_n <= '1';
led_cathode <= '0';
-- compteur de 0 Ã max_count
compteur : process(Clk)
variable count : natural range 0 to max_count;
begin
- if Rst_n = '0' then
- count := 0;
- led_anode <= '0';
- elsif rising_edge(Clk) then
+ if rising_edge(Clk) then
if count < max_count/2 then
led_anode <='1';
count := count + 1;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2020-07-09 16:09:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5a2d1cee377f80e2add2501c5793820ab747923d (commit)
from 477ecb744a9a35b8e58a8dd6254745d040ffbd9e (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 5a2d1cee377f80e2add2501c5793820ab747923d
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Jul 9 18:08:49 2020 +0200
[BUILDROOT] 2019.02: fixes 046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch, again...
-----------------------------------------------------------------------
Summary of changes:
.../046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index ab09e339c..486ccbf7c 100644
--- a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -15,7 +15,7 @@ Index: buildroot/package/gpsd/gpsd.mk
+ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)"
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)"
+GPSD_SCONS_OPTS += \
+ python_libdir=/usr/lib/python$(PYTHON_VERSION)/
+else ifeq ($(BR2_PACKAGE_PYTHON3),y)
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-30 14:28:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc5 has been updated
via 50a4e7e243d3f4d77f97c0cb72b01b0e7f508f6b (commit)
via 64b997b362831e2e129ebda862515cedef3f0940 (commit)
via 587a6a15483a96da972d0661937b6dfd82b973b3 (commit)
via 1303ad5cbe25cab027f01d8e1129e235853e63d5 (commit)
via 701442c74a983618e1853806c8ac29138a2c6eb5 (commit)
from eaf7d215685256254da9235b2fa0f8ce0840c8f9 (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 50a4e7e243d3f4d77f97c0cb72b01b0e7f508f6b
Author: Jagan Teki <ja...@am...>
Date: Thu Jun 18 19:33:12 2020 +0530
mmc: sdhci: Fix HISPD bit handling
SDHCI HISPD bits need to be configured based on desired mmc
timings mode and some HISPD quirks.
So, handle the HISPD bit based on the mmc computed selected
mode(timing parameter) rather than fixed mmc card clock
frequency.
Linux handle the HISPD similar like this in below commit but no
SDHCI_QUIRK_BROKEN_HISPD_MODE,
commit <501639bf2173> ("mmc: sdhci: fix SDHCI_QUIRK_NO_HISPD_BIT handling")
This eventually fixed the mmc write issue observed in
rk3399 sdhci controller.
Bug log for refernece,
=> gpt write mmc 0 $partitions
Writing GPT: mmc write failed
** Can't write to device 0 **
** Can't write to device 0 **
error!
Cc: Kever Yang <kev...@ro...>
Cc: Peng Fan <pen...@nx...>
Peng Fan: added back "ctrl &= ~SDHCI_CTRL_HISPD;" per Jaehoon's suggestion
Tested-by: Suniel Mahesh <su...@am...> # roc-rk3399-pc
Signed-off-by: Jagan Teki <ja...@am...>
(cherry picked from commit f12341a9529540113f01989149bbbeb68662a829)
commit 64b997b362831e2e129ebda862515cedef3f0940
Author: Haibo Chen <hai...@nx...>
Date: Mon Jun 15 17:18:12 2020 +0800
mmc: retry CMD1 in mmc_send_op_cond() until the eMMC is ready
According to eMMC specification v5.1 section 6.4.3, we should issue
CMD1 repeatedly in the idle state until the eMMC is ready even if
mmc_send_op_cond() send CMD1 with argument = 0. Otherwise some eMMC
devices seems to enter the inactive mode after mmc_complete_op_cond()
issued CMD0 when the eMMC device is busy.
Signed-off-by: Haibo Chen <hai...@nx...>
Reviewed-by: Peng Fan <pen...@nx...>
(cherry picked from commit fe95905ffed57d617cad81a71ac419d53aaa1ebf)
commit 587a6a15483a96da972d0661937b6dfd82b973b3
Author: Haibo Chen <hai...@nx...>
Date: Mon Jun 22 19:38:04 2020 +0800
mmc: fsl_esdhc_imx: disable the CMD CRC check for standard tuning
In current code, we add 1ms dealy after each tuning command for standard
tuning method. Adding this 1ms dealy is because USDHC default check the
CMD CRC and DATA line. If detect the CMD CRC, USDHC standard tuning
IC logic do not wait for the tuning data sending out by the card, trigger
the buffer read ready interrupt immediately, and step to next cycle. So
when next time the new tuning command send out by USDHC, card may still
not send out the tuning data of the upper commandï¼then some eMMC cards
may stuck, can't response to any command, block the whole tuning procedure.
If do not check the CMD CRC for tuning, then do not has this issue. USDHC
will wait for the tuning data of each tuning command and check them. If the
tuning data pass the check, it also means the CMD line also okay for tuning.
So this patch disable the CMD CRC check for tuning, save some time for the
whole tuning procedure.
Signed-off-by: Haibo Chen <hai...@nx...>
(cherry picked from commit ba61676ff9f8225ebc0ea33ad9f48862e718fd01)
commit 1303ad5cbe25cab027f01d8e1129e235853e63d5
Author: Haibo Chen <hai...@nx...>
Date: Mon Jun 22 19:38:03 2020 +0800
mmc: fsl_esdhc_imx: fix the mask for tuning start point
According the RM, the bit[6~0] of register ESDHC_TUNING_CTRL is
TUNING_START_TAP, bit[7] of this register is to disable the command
CRC check for standard tuning. So fix it here.
Fixes: fa33d207494c ("mmc: split fsl_esdhc driver for i.MX")
Signed-off-by: Haibo Chen <hai...@nx...>
(cherry picked from commit 135c10a7834aa7e0f26f52e5173925e695cba48f)
commit 701442c74a983618e1853806c8ac29138a2c6eb5
Author: Marek Vasut <ma...@de...>
Date: Sat Jun 20 14:28:25 2020 +0200
cmd: mmc: Cache-align extcsd read target
The extcsd read target must be cache aligned in case the controller
uses DMA to read the extcsd register, make it so.
Signed-off-by: Marek Vasut <ma...@de...>
Reviewed-by: Michael Trimarchi <mi...@am...>
(cherry picked from commit d581076a33e7fd1f2b019a0a53eebe58d76623c1)
-----------------------------------------------------------------------
Summary of changes:
cmd/mmc.c | 4 +++-
drivers/mmc/fsl_esdhc_imx.c | 22 ++++++++++++----------
drivers/mmc/mmc.c | 9 ++++++++-
drivers/mmc/sdhci.c | 25 +++++++++++++++++++------
include/fsl_esdhc_imx.h | 3 ++-
5 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 1c252e0502..1529a3e05d 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
#include <blk.h>
#include <command.h>
#include <console.h>
+#include <memalign.h>
#include <mmc.h>
#include <part.h>
#include <sparse_format.h>
@@ -56,7 +57,8 @@ static void print_mmcinfo(struct mmc *mmc)
if (!IS_SD(mmc) && mmc->version >= MMC_VERSION_4_41) {
bool has_enh = (mmc->part_support & ENHNCD_SUPPORT) != 0;
bool usr_enh = has_enh && (mmc->part_attr & EXT_CSD_ENH_USR);
- u8 wp, ext_csd[MMC_MAX_BLOCK_LEN];
+ ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
+ u8 wp;
int ret;
#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index f42e018434..5b61eeb214 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -907,19 +907,9 @@ static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode)
ctrl = readl(®s->autoc12err);
if ((!(ctrl & MIX_CTRL_EXE_TUNE)) &&
(ctrl & MIX_CTRL_SMPCLK_SEL)) {
- /*
- * need to wait some time, make sure sd/mmc fininsh
- * send out tuning data, otherwise, the sd/mmc can't
- * response to any command when the card still out
- * put the tuning data.
- */
- mdelay(1);
ret = 0;
break;
}
-
- /* Add 1ms delay for SD and eMMC */
- mdelay(1);
}
writel(irqstaten, ®s->irqstaten);
@@ -1267,6 +1257,18 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv,
val |= priv->tuning_start_tap;
val &= ~ESDHC_TUNING_STEP_MASK;
val |= (priv->tuning_step) << ESDHC_TUNING_STEP_SHIFT;
+
+ /* Disable the CMD CRC check for tuning, if not, need to
+ * add some delay after every tuning command, because
+ * hardware standard tuning logic will directly go to next
+ * step once it detect the CMD CRC error, will not wait for
+ * the card side to finally send out the tuning data, trigger
+ * the buffer read ready interrupt immediately. If usdhc send
+ * the next tuning command some eMMC card will stuck, can't
+ * response, block the tuning procedure or the first command
+ * after the whole tuning procedure always can't get any response.
+ */
+ val |= ESDHC_TUNING_CMD_CRC_CHECK_DISABLE;
writel(val, ®s->tuning_ctrl);
}
}
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 620bb93064..725a36799d 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -669,12 +669,15 @@ static int mmc_send_op_cond_iter(struct mmc *mmc, int use_arg)
static int mmc_send_op_cond(struct mmc *mmc)
{
int err, i;
+ int timeout = 1000;
+ uint start;
/* Some cards seem to need this */
mmc_go_idle(mmc);
+ start = get_timer(0);
/* Asking to the card its capabilities */
- for (i = 0; i < 2; i++) {
+ for (i = 0; ; i++) {
err = mmc_send_op_cond_iter(mmc, i != 0);
if (err)
return err;
@@ -682,6 +685,10 @@ static int mmc_send_op_cond(struct mmc *mmc)
/* exit if not busy (flag seems to be inverted) */
if (mmc->ocr & OCR_BUSY)
break;
+
+ if (get_timer(start) > timeout)
+ return -ETIMEDOUT;
+ udelay(100);
}
mmc->op_cond_pending = 1;
return 0;
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 92cc8434af..f4eb655f6e 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -567,6 +567,7 @@ static int sdhci_set_ios(struct mmc *mmc)
#endif
u32 ctrl;
struct sdhci_host *host = mmc->priv;
+ bool no_hispd_bit = false;
if (host->ops && host->ops->set_control_reg)
host->ops->set_control_reg(host);
@@ -594,14 +595,26 @@ static int sdhci_set_ios(struct mmc *mmc)
ctrl &= ~SDHCI_CTRL_4BITBUS;
}
- if (mmc->clock > 26000000)
- ctrl |= SDHCI_CTRL_HISPD;
- else
- ctrl &= ~SDHCI_CTRL_HISPD;
-
if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||
- (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))
+ (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE)) {
ctrl &= ~SDHCI_CTRL_HISPD;
+ no_hispd_bit = true;
+ }
+
+ if (!no_hispd_bit) {
+ if (mmc->selected_mode == MMC_HS ||
+ mmc->selected_mode == SD_HS ||
+ mmc->selected_mode == MMC_DDR_52 ||
+ mmc->selected_mode == MMC_HS_200 ||
+ mmc->selected_mode == MMC_HS_400 ||
+ mmc->selected_mode == UHS_SDR25 ||
+ mmc->selected_mode == UHS_SDR50 ||
+ mmc->selected_mode == UHS_SDR104 ||
+ mmc->selected_mode == UHS_DDR50)
+ ctrl |= SDHCI_CTRL_HISPD;
+ else
+ ctrl &= ~SDHCI_CTRL_HISPD;
+ }
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index 33c6d52bfe..279a66d9bf 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -203,7 +203,8 @@
#define ESDHC_STD_TUNING_EN BIT(24)
/* NOTE: the minimum valid tuning start tap for mx6sl is 1 */
#define ESDHC_TUNING_START_TAP_DEFAULT 0x1
-#define ESDHC_TUNING_START_TAP_MASK 0xff
+#define ESDHC_TUNING_START_TAP_MASK 0x7f
+#define ESDHC_TUNING_CMD_CRC_CHECK_DISABLE BIT(7)
#define ESDHC_TUNING_STEP_MASK 0x00070000
#define ESDHC_TUNING_STEP_SHIFT 16
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-06-30 09:54:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 477ecb744a9a35b8e58a8dd6254745d040ffbd9e (commit)
via 7747d4faf6b0281e69ac27cba2e1a63ea094f292 (commit)
from 691e0c66745b416aff2eec68e7c8d436aabb77dd (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 477ecb744a9a35b8e58a8dd6254745d040ffbd9e
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 30 11:53:51 2020 +0200
[PATCH] 5.4.imx_legacy: add MAX17048/MAX17049 support
commit 7747d4faf6b0281e69ac27cba2e1a63ea094f292
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 30 11:45:29 2020 +0200
[PATCH] 5.4.imx_legacy: i.MX8MM: add missing mux option for UART{1,2}
-----------------------------------------------------------------------
Summary of changes:
...mx8mm-Add-missing-mux-options-for-UART1-a.patch | 81 +++++
...ower-supply-add-MAX17048-MAX17049-support.patch | 377 +++++++++++++++++++++
2 files changed, 458 insertions(+)
create mode 100644 patches/linux/5.4.imx_legacy/0502-arm64-dts-imx8mm-Add-missing-mux-options-for-UART1-a.patch
create mode 100644 patches/linux/5.4.imx_legacy/0503-power-supply-add-MAX17048-MAX17049-support.patch
diff --git a/patches/linux/5.4.imx_legacy/0502-arm64-dts-imx8mm-Add-missing-mux-options-for-UART1-a.patch b/patches/linux/5.4.imx_legacy/0502-arm64-dts-imx8mm-Add-missing-mux-options-for-UART1-a.patch
new file mode 100644
index 000000000..34e116deb
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0502-arm64-dts-imx8mm-Add-missing-mux-options-for-UART1-a.patch
@@ -0,0 +1,81 @@
+From 2728c4a124a10e96891e93748471f8e2398c266f Mon Sep 17 00:00:00 2001
+From: Frieder Schrempf <fri...@ko...>
+Date: Tue, 10 Dec 2019 14:15:17 +0000
+Subject: [PATCH 1/1] arm64: dts: imx8mm: Add missing mux options for UART1 and
+ UART2 signals
+
+According to the reference manual and the "Pins Tool" from NXP, the
+signals for UART1 and UART2 can be muxed to the SAI2 and SAI3 pads
+respectively. Let's add the missing options.
+
+Signed-off-by: Frieder Schrempf <fri...@ko...>
+Acked-by: Rob Herring <ro...@ke...>
+Signed-off-by: Shawn Guo <sha...@ke...>
+---
+ arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h b/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
+index cffa8991880d..5ccc4cc91959 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
++++ b/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
+@@ -430,18 +430,26 @@
+ #define MX8MM_IOMUXC_SAI1_MCLK_SIM_M_HRESP 0x1AC 0x414 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI2_RXFS_SAI2_RX_SYNC 0x1B0 0x418 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI2_RXFS_SAI5_TX_SYNC 0x1B0 0x418 0x4EC 0x1 0x2
++#define MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x1B0 0x418 0x000 0x4 0x0
++#define MX8MM_IOMUXC_SAI2_RXFS_UART1_DTE_RX 0x1B0 0x418 0x4F4 0x4 0x2
+ #define MX8MM_IOMUXC_SAI2_RXFS_GPIO4_IO21 0x1B0 0x418 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI2_RXFS_SIM_M_HSIZE0 0x1B0 0x418 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI2_RXC_SAI2_RX_BCLK 0x1B4 0x41C 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI2_RXC_SAI5_TX_BCLK 0x1B4 0x41C 0x4E8 0x1 0x2
++#define MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x1B4 0x41C 0x4F4 0x4 0x3
++#define MX8MM_IOMUXC_SAI2_RXC_UART1_DTE_TX 0x1B4 0x41C 0x000 0x4 0x0
+ #define MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22 0x1B4 0x41C 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI2_RXC_SIM_M_HSIZE1 0x1B4 0x41C 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0 0x1B8 0x420 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI2_RXD0_SAI5_TX_DATA0 0x1B8 0x420 0x000 0x1 0x0
++#define MX8MM_IOMUXC_SAI2_RXD0_UART1_DCE_RTS_B 0x1B8 0x420 0x4F0 0x4 0x2
++#define MX8MM_IOMUXC_SAI2_RXD0_UART1_DTE_CTS_B 0x1B8 0x420 0x000 0x4 0x0
+ #define MX8MM_IOMUXC_SAI2_RXD0_GPIO4_IO23 0x1B8 0x420 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI2_RXD0_SIM_M_HSIZE2 0x1B8 0x420 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0x1BC 0x424 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI2_TXFS_SAI5_TX_DATA1 0x1BC 0x424 0x000 0x1 0x0
++#define MX8MM_IOMUXC_SAI2_TXFS_UART1_DCE_CTS_B 0x1BC 0x424 0x000 0x4 0x0
++#define MX8MM_IOMUXC_SAI2_TXFS_UART1_DTE_RTS_B 0x1BC 0x424 0x4F0 0x4 0x3
+ #define MX8MM_IOMUXC_SAI2_TXFS_GPIO4_IO24 0x1BC 0x424 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI2_TXFS_SIM_M_HWRITE 0x1BC 0x424 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0x1C0 0x428 0x000 0x0 0x0
+@@ -464,21 +472,29 @@
+ #define MX8MM_IOMUXC_SAI3_RXC_SAI3_RX_BCLK 0x1D0 0x438 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI3_RXC_GPT1_CLK 0x1D0 0x438 0x000 0x1 0x0
+ #define MX8MM_IOMUXC_SAI3_RXC_SAI5_RX_BCLK 0x1D0 0x438 0x4D0 0x2 0x2
++#define MX8MM_IOMUXC_SAI3_RXC_UART2_DCE_CTS_B 0x1D0 0x438 0x000 0x4 0x0
++#define MX8MM_IOMUXC_SAI3_RXC_UART2_DTE_RTS_B 0x1D0 0x438 0x4F8 0x4 0x2
+ #define MX8MM_IOMUXC_SAI3_RXC_GPIO4_IO29 0x1D0 0x438 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI3_RXC_TPSMP_HTRANS1 0x1D0 0x438 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI3_RXD_SAI3_RX_DATA0 0x1D4 0x43C 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI3_RXD_GPT1_COMPARE1 0x1D4 0x43C 0x000 0x1 0x0
+ #define MX8MM_IOMUXC_SAI3_RXD_SAI5_RX_DATA0 0x1D4 0x43C 0x4D4 0x2 0x2
++#define MX8MM_IOMUXC_SAI3_RXD_UART2_DCE_RTS_B 0x1D4 0x43C 0x4F8 0x4 0x3
++#define MX8MM_IOMUXC_SAI3_RXD_UART2_DTE_CTS_B 0x1D4 0x43C 0x000 0x4 0x0
+ #define MX8MM_IOMUXC_SAI3_RXD_GPIO4_IO30 0x1D4 0x43C 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI3_RXD_TPSMP_HDATA0 0x1D4 0x43C 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0x1D8 0x440 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI3_TXFS_GPT1_CAPTURE2 0x1D8 0x440 0x000 0x1 0x0
+ #define MX8MM_IOMUXC_SAI3_TXFS_SAI5_RX_DATA1 0x1D8 0x440 0x4D8 0x2 0x2
++#define MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX 0x1D8 0x440 0x4Fc 0x4 0x2
++#define MX8MM_IOMUXC_SAI3_TXFS_UART2_DTE_TX 0x1D8 0x440 0x000 0x4 0x0
+ #define MX8MM_IOMUXC_SAI3_TXFS_GPIO4_IO31 0x1D8 0x440 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI3_TXFS_TPSMP_HDATA1 0x1D8 0x440 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0x1DC 0x444 0x000 0x0 0x0
+ #define MX8MM_IOMUXC_SAI3_TXC_GPT1_COMPARE2 0x1DC 0x444 0x000 0x1 0x0
+ #define MX8MM_IOMUXC_SAI3_TXC_SAI5_RX_DATA2 0x1DC 0x444 0x4DC 0x2 0x2
++#define MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX 0x1DC 0x444 0x000 0x4 0x0
++#define MX8MM_IOMUXC_SAI3_TXC_UART2_DTE_RX 0x1DC 0x444 0x4Fc 0x4 0x3
+ #define MX8MM_IOMUXC_SAI3_TXC_GPIO5_IO0 0x1DC 0x444 0x000 0x5 0x0
+ #define MX8MM_IOMUXC_SAI3_TXC_TPSMP_HDATA2 0x1DC 0x444 0x000 0x7 0x0
+ #define MX8MM_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0x1E0 0x448 0x000 0x0 0x0
+--
+2.26.2
+
diff --git a/patches/linux/5.4.imx_legacy/0503-power-supply-add-MAX17048-MAX17049-support.patch b/patches/linux/5.4.imx_legacy/0503-power-supply-add-MAX17048-MAX17049-support.patch
new file mode 100644
index 000000000..2a66e3fda
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0503-power-supply-add-MAX17048-MAX17049-support.patch
@@ -0,0 +1,377 @@
+From 96768018453b285d752ef8d1952ca1dcac900388 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 30 Jun 2020 11:50:22 +0200
+Subject: [PATCH 1/1] power: supply: add MAX17048/MAX17049 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/power/supply/Kconfig | 8 +
+ drivers/power/supply/Makefile | 1 +
+ drivers/power/supply/max17048_battery.c | 320 ++++++++++++++++++++++++
+ 3 files changed, 329 insertions(+)
+ create mode 100644 drivers/power/supply/max17048_battery.c
+
+diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
+index 67cf7d28eed1..560504a416ea 100644
+--- a/drivers/power/supply/Kconfig
++++ b/drivers/power/supply/Kconfig
+@@ -386,6 +386,14 @@ config BATTERY_MAX1721X
+ Say Y here to enable support for the MAX17211/MAX17215 standalone
+ battery gas-gauge.
+
++config BATTERY_MAX17048
++ tristate "Maxim MAX17048/MAX17049 Fuel Gauge"
++ depends on I2C
++ help
++ MAX17048 is fuel-gauge systems for lithium-ion (Li+) batteries in
++ handheld and portable equipment. The MAX17048 is configured to
++ operate with a single lithium cell and the MAX17049 with two cells.
++
+ config BATTERY_Z2
+ tristate "Z2 battery driver"
+ depends on I2C && MACH_ZIPIT2
+diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
+index 9e41cdb2eaff..7fbdf02bc83b 100644
+--- a/drivers/power/supply/Makefile
++++ b/drivers/power/supply/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o
+ obj-$(CONFIG_BATTERY_DA9150) += da9150-fg.o
+ obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
+ obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o
++obj-$(CONFIG_BATTERY_MAX17048) += max17048_battery.o
+ obj-$(CONFIG_BATTERY_MAX1721X) += max1721x_battery.o
+ obj-$(CONFIG_BATTERY_Z2) += z2_battery.o
+ obj-$(CONFIG_BATTERY_RT5033) += rt5033_battery.o
+diff --git a/drivers/power/supply/max17048_battery.c b/drivers/power/supply/max17048_battery.c
+new file mode 100644
+index 000000000000..f7b04612410e
+--- /dev/null
++++ b/drivers/power/supply/max17048_battery.c
+@@ -0,0 +1,320 @@
++// SPDX-License-Identifier: GPL-2.0
++//
++// max17048_battery.c
++// fuel-gauge systems for lithium-ion (Li+) batteries
++//
++// Copyright (C) 2019 Armadeus Systems
++// Sébastien Szymanski <seb...@ar...>
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/mutex.h>
++#include <linux/err.h>
++#include <linux/i2c.h>
++#include <linux/delay.h>
++#include <linux/power_supply.h>
++#include <linux/slab.h>
++
++#define MAX17048_VCELL 0x02
++#define MAX17048_SOC 0x04
++#define MAX17048_MODE 0x06
++#define MAX17048_VER 0x08
++#define MAX17048_RCOMP 0x0C
++#define MAX17048_CMD 0xFE
++
++
++#define MAX17048_DELAY 1000
++#define MAX17048_BATTERY_FULL 95
++
++struct max17048_chip {
++ struct i2c_client *client;
++ struct power_supply *battery;
++ struct delayed_work work;
++
++ /* State Of Connect */
++ int online;
++ /* battery voltage */
++ int vcell;
++ /* battery capacity */
++ int soc;
++ /* State Of Charge */
++ int status;
++
++ /* battery capacity from voltage */
++ int soc2;
++ int vcell_count;
++ int vcell_sum;
++};
++
++static int max17048_voltage_to_soc(int voltage)
++{
++ int percent;
++
++ voltage = voltage * 625 / 8;
++
++ percent = ((voltage - 3200000) * 1000) / (4200000-3200000);
++ percent = (percent + 5) / 10;
++ if (percent < 0)
++ return 0;
++ if (percent > 100)
++ return 100;
++ return percent;
++}
++
++static int max17048_get_property(struct power_supply *psy,
++ enum power_supply_property psp,
++ union power_supply_propval *val)
++{
++ struct max17048_chip *chip = power_supply_get_drvdata(psy);
++
++ switch (psp) {
++ case POWER_SUPPLY_PROP_STATUS:
++ val->intval = chip->status;
++ break;
++ case POWER_SUPPLY_PROP_ONLINE:
++ val->intval = chip->online;
++ break;
++ case POWER_SUPPLY_PROP_VOLTAGE_NOW:
++ val->intval = chip->vcell * 625 / 8;
++ break;
++ case POWER_SUPPLY_PROP_CAPACITY:
++ val->intval = chip->soc2;
++ break;
++ default:
++ return -EINVAL;
++ }
++ return 0;
++}
++
++static int max17048_write_reg(struct i2c_client *client, int reg, u16 value)
++{
++ int ret;
++
++ ret = i2c_smbus_write_word_swapped(client, reg, value);
++
++ if (ret < 0)
++ dev_err(&client->dev, "%s: err %d\n", __func__, ret);
++
++ return ret;
++}
++
++static int max17048_read_reg(struct i2c_client *client, int reg)
++{
++ int ret;
++
++ ret = i2c_smbus_read_word_swapped(client, reg);
++
++ if (ret < 0)
++ dev_err(&client->dev, "%s: err %d\n", __func__, ret);
++
++ return ret;
++}
++
++static int max17048_reset(struct i2c_client *client)
++{
++ return max17048_write_reg(client, MAX17048_CMD, 0x0054);
++}
++
++static void max17048_get_vcell(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++ u16 vcell;
++
++ vcell = max17048_read_reg(client, MAX17048_VCELL);
++
++ chip->vcell = vcell;
++}
++
++static void max17048_get_soc(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++ u16 soc;
++
++ soc = max17048_read_reg(client, MAX17048_SOC);
++
++ chip->soc = (soc >> 8);
++}
++
++static void max17048_get_soc2(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ if (0 == chip->vcell_sum) {
++ /* first time */
++ chip->soc2 = max17048_voltage_to_soc(chip->vcell);
++ } else {
++ if (chip->vcell_count == 6) {
++ chip->soc2 = max17048_voltage_to_soc(chip->vcell_sum / chip->vcell_count);
++ chip->vcell_count = 0;
++ chip->vcell_sum = 0;
++ }
++ }
++ chip->vcell_sum += chip->vcell;
++ chip->vcell_count ++;
++}
++
++static void max17048_get_version(struct i2c_client *client)
++{
++ u16 version;
++
++ version = max17048_read_reg(client, MAX17048_VER);
++
++ dev_info(&client->dev, "MAX17048/MAX17049 Fuel-Gauge Ver 0x%x\n", version);
++}
++
++static void max17048_get_online(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ chip->online = 1;
++}
++
++static void max17048_get_status(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ chip->status = POWER_SUPPLY_STATUS_UNKNOWN;
++}
++
++static void max17048_work(struct work_struct *work)
++{
++ struct max17048_chip *chip;
++
++ chip = container_of(work, struct max17048_chip, work.work);
++
++ max17048_get_vcell(chip->client);
++ max17048_get_soc(chip->client);
++ max17048_get_online(chip->client);
++ max17048_get_status(chip->client);
++
++ max17048_get_soc2(chip->client);
++
++ queue_delayed_work(system_power_efficient_wq, &chip->work,
++ MAX17048_DELAY);
++}
++
++static enum power_supply_property max17048_battery_props[] = {
++ POWER_SUPPLY_PROP_STATUS,
++ POWER_SUPPLY_PROP_ONLINE,
++ POWER_SUPPLY_PROP_VOLTAGE_NOW,
++ POWER_SUPPLY_PROP_CAPACITY,
++};
++
++static const struct power_supply_desc max17048_battery_desc = {
++ .name = "battery",
++ .type = POWER_SUPPLY_TYPE_BATTERY,
++ .get_property = max17048_get_property,
++ .properties = max17048_battery_props,
++ .num_properties = ARRAY_SIZE(max17048_battery_props),
++};
++
++static int max17048_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct i2c_adapter *adapter = client->adapter;
++ struct power_supply_config psy_cfg = {};
++ struct max17048_chip *chip;
++ int ret;
++
++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
++ return -EIO;
++
++ chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
++ if (!chip)
++ return -ENOMEM;
++
++ chip->client = client;
++
++ i2c_set_clientdata(client, chip);
++ psy_cfg.drv_data = chip;
++
++ ret = max17048_reset(client);
++ if (ret < 0) {
++ return ret;
++ }
++
++ chip->battery = power_supply_register(&client->dev,
++ &max17048_battery_desc, &psy_cfg);
++ if (IS_ERR(chip->battery)) {
++ dev_err(&client->dev, "failed: power supply register\n");
++ return PTR_ERR(chip->battery);
++ }
++
++ max17048_get_version(client);
++
++ INIT_DEFERRABLE_WORK(&chip->work, max17048_work);
++ queue_delayed_work(system_power_efficient_wq, &chip->work,
++ MAX17048_DELAY);
++
++ return 0;
++}
++
++static int max17048_remove(struct i2c_client *client)
++{
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ power_supply_unregister(chip->battery);
++ cancel_delayed_work(&chip->work);
++ return 0;
++}
++
++#ifdef CONFIG_PM_SLEEP
++
++static int max17048_suspend(struct device *dev)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ cancel_delayed_work(&chip->work);
++ return 0;
++}
++
++static int max17048_resume(struct device *dev)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct max17048_chip *chip = i2c_get_clientdata(client);
++
++ queue_delayed_work(system_power_efficient_wq, &chip->work,
++ MAX17048_DELAY);
++ return 0;
++}
++
++static SIMPLE_DEV_PM_OPS(max17048_pm_ops, max17048_suspend, max17048_resume);
++#define MAX17048_PM_OPS (&max17048_pm_ops)
++
++#else
++
++#define MAX17048_PM_OPS NULL
++
++#endif /* CONFIG_PM_SLEEP */
++
++static const struct i2c_device_id max17048_id[] = {
++ { "max17048" },
++ { "max17049" },
++ { }
++};
++MODULE_DEVICE_TABLE(i2c, max17048_id);
++
++static const struct of_device_id max17048_of_match[] = {
++ { .compatible = "maxim,max17048" },
++ { .compatible = "maxim,max17049" },
++ { },
++};
++MODULE_DEVICE_TABLE(of, max17048_of_match);
++
++static struct i2c_driver max17048_i2c_driver = {
++ .driver = {
++ .name = "max17048",
++ .of_match_table = max17048_of_match,
++ .pm = MAX17048_PM_OPS,
++ },
++ .probe = max17048_probe,
++ .remove = max17048_remove,
++ .id_table = max17048_id,
++};
++module_i2c_driver(max17048_i2c_driver);
++
++MODULE_AUTHOR("Sébastien Szymanski <seb...@ar...>");
++MODULE_DESCRIPTION("MAX17048/MAX17049 Fuel Gauge");
++MODULE_LICENSE("GPL");
+--
+2.26.2
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-30 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 "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc5 has been updated
via eaf7d215685256254da9235b2fa0f8ce0840c8f9 (commit)
from 3f0959d62c8581af49a417d7d5b1ee0be4b0e4d4 (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 eaf7d215685256254da9235b2fa0f8ce0840c8f9
Author: Peng Fan <pen...@nx...>
Date: Sat May 30 16:44:15 2020 +0800
pinctrl: imx8m: move soc info to data section
The soc info without initialization value should be put into
data section. The driver could be used before relocation,
with it in BSS section could cause issue, since BSS section
is not initializated and it might overwrite other areas that
used by others, such as dtb.
Signed-off-by: Peng Fan <pen...@nx...>
-----------------------------------------------------------------------
Summary of changes:
drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c
index 5b7cbb69ae..0626fde58f 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx8m.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c
@@ -8,7 +8,7 @@
#include "pinctrl-imx.h"
-static struct imx_pinctrl_soc_info imx8mq_pinctrl_soc_info;
+static struct imx_pinctrl_soc_info imx8mq_pinctrl_soc_info __attribute__((section(".data")));
static int imx8mq_pinctrl_probe(struct udevice *dev)
{
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-06-29 08:44: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 "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc5 has been updated
via 3f0959d62c8581af49a417d7d5b1ee0be4b0e4d4 (commit)
from 2fc28dc3521594ecf04b9851ca7bdfd70ad54379 (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 3f0959d62c8581af49a417d7d5b1ee0be4b0e4d4
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 29 10:33:50 2020 +0200
power: pmic_pca9450: fix PCA9450A I2C address
PCA9450A I2C address is 0x25. Fix it.
-----------------------------------------------------------------------
Summary of changes:
drivers/power/pmic/pmic_pca9450.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c
index 67a9090200..c0fb78c4cd 100644
--- a/drivers/power/pmic/pmic_pca9450.c
+++ b/drivers/power/pmic/pmic_pca9450.c
@@ -23,7 +23,7 @@ int power_pca9450a_init(unsigned char bus)
p->name = pca9450_name;
p->interface = PMIC_I2C;
p->number_of_regs = PCA9450_REG_NUM;
- p->hw.i2c.addr = 0x35;
+ p->hw.i2c.addr = 0x25;
p->hw.i2c.tx_num = 1;
p->bus = bus;
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-06-23 09:13: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 "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc5 has been created
at 2fc28dc3521594ecf04b9851ca7bdfd70ad54379 (commit)
- Log -----------------------------------------------------------------
commit 2fc28dc3521594ecf04b9851ca7bdfd70ad54379
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 23 10:12:04 2020 +0200
regulator: fixed: add .set_value
commit 4b5e424e265c495a72e3f02fa5b4101076aaefee
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:37:46 2020 +0200
imx: imx8m: allow passing DDR/HDMI firmware file paths
commit 992f8746f4baa437217556efd9a121769683fef8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:36:42 2020 +0200
imx: imx8m: build SPL file
commit 0d0edce600bf8689ef91acf4a22b34b0e7ff1e00
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 29 14:33:30 2020 +0200
usb: ci_udc: don't use DM for clk handling
commit a4f1efb84fc20acbf1a34cf326170c94d78461a6
Author: Frieder Schrempf <fri...@ko...>
Date: Mon May 20 16:18:22 2019 +0200
Add enable_usboh3_clk function for i.MX8M
Currently we can't use DM_USB in SPL as the ci_udc driver is not
ported to DM yet.
commit 86ed13cd1951bf636bd27c30643e50c3ac97597c
Author: Jacky Bai <pin...@nx...>
Date: Tue May 12 09:50:46 2020 +0800
driver: ddr: imx: correct the pwrctl setting of selfref_en on imx8m
The 'selfref_en' should be bit'0', so correct the setting to
enable the auto self-refresh.
Reviewed-by: Jian Li <ji...@nx...>
Reviewed-by: Ye Li <ye...@nx...>
Signed-off-by: Jacky Bai <pin...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
commit 5f03b966e987a8503f4ef7b15998f4b7384e7ecc
Author: Jacky Bai <pin...@nx...>
Date: Tue May 12 09:50:45 2020 +0800
driver: ddr: imx: skip ddr_ss_gpr config on imx8mn
There is no DDR_SS_GPR0 exits on i.MX8MN, so skip setting
this register on i.MX8MN.
Signed-off-by: Jacky Bai <pin...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
commit 07ae291a983ce3d9957b5791faf447d0b002a785
Author: Sherry Sun <she...@nx...>
Date: Tue Jul 30 20:42:02 2019 -0400
MLK-22357-1 usb: Add handle_interrupts function pointer for UCLASS_USB_GADGET_GENERIC
Since the orginal way to call interrupts handle function of DM usb
gadget driver is through dm_usb_gadget_handle_interrupts(), when we want
to use two or more different gadget drivers at the same time, it will
cause error of duplicate names.
So here add a handle_interrupts function pointer instead of driectly
call dm_usb_gadget_handle_interrupts(), then the error can be avoided.
Signed-off-by: Sherry Sun <she...@nx...>
commit ad9b6211fed95e931e38e26e0d66e58dff49cbe9
Author: Sherry Sun <she...@nx...>
Date: Fri Jul 26 21:12:21 2019 -0400
MLK-22336-3 usb: Kconfig: imply DM_USB_GADGET
Since the ci_udc driver has been converted to DM driver, the
CONFIG_DM_USB_GADGET should also be selected when CONFIG_CI_UDC
is enabled, then we can use DM ci_udc driver.
Signed-off-by: Sherry Sun <she...@nx...>
Reviewed-by: Ye Li <ye...@nx...>
commit 2bbc0fc67e60295224ceaf4729664fd59af819d2
Author: Sherry Sun <she...@nx...>
Date: Tue Jul 23 15:21:57 2019 -0400
MLK-22336-1 usb: ci_udc: Convert driver to DM_USB_GADGET
Convert the ci_udc driver to driver model by using the uclass
UCLASS_USB_GADGET_GENERIC. The clk and power of USB controller and USB
PHY both are initialized by parsing the device tree nodes.
If CONFIG_DM_USB_GADGET is defined, we use the ci_udc driver in DM way,
if it does not defined, we can use ci_udc driver in its original Non-DM
way.
Move some USB PHY register definitions from ehci-mx6.c to
asm/mach-imx/regs-usbphy.h in order to share with DM usb gadget driver.
Signed-off-by: Sherry Sun <she...@nx...>
Reviewed-by: Ye Li <ye...@nx...>
commit 4d2d83c2405f322eca8d72fe45f081a604e3260b
Author: Li Jun <ju...@nx...>
Date: Tue Dec 18 15:48:17 2018 +0800
MLK-20493-10 usb: gaget: ci: set ep's desc when enable ep
As we need standard usb_ep's desc, so set it when enable ep.
Reviewed-by: Peter Chen <pet...@nx...>
Signed-off-by: Li Jun <ju...@nx...>
(cherry picked from commit 7d7097a07f8b770840f2e1e240b8cd004a9478b0)
commit 01721b44f7b778f660b7ff3e9e64a1591121db56
Author: Li Jun <ju...@nx...>
Date: Mon Dec 17 09:10:49 2018 +0800
MLK-20493-8 usb: udc: ci: update speed handling
Remove the gadget driver speed check, and set its max_speed to
be USB_SPEED_HIGH.
Reviewed-by: Ye Li <ye...@nx...>
Reviewed-by: Peter Chen <pet...@nx...>
Tested-by: faqiang.zhu <faq...@nx...>
Signed-off-by: Li Jun <ju...@nx...>
(cherry picked from commit d2eda0a1834e3f4747642a57b36dd76e80e0a101)
Signed-off-by: Sébastien Szymanski <seb...@ar...>
commit 511382f6b317a94186177e0041093c8e81a691b2
Author: Ye Li <ye...@nx...>
Date: Fri May 11 01:32:39 2018 -0700
MLK-18290-4 usb: ci_udc: Add function to remove usb device
When unregister gadget driver in ci_udc, the usb device is not
removed or stop. This causes next "usb start" fails to work.
Add a new interface "usb_remove_ehci_gadget" in usb-uclass to
remove the usb device for DM driver. Using "usb_lowlevel_stop" for
non-DM driver.
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit c73d137e0a4a613a49f6f63ec63332508afb88c0)
(cherry picked from commit c2f83b46c21e738fa8176a8f83661bf3603067f8)
Signed-off-by: Sébastien Szymanski <seb...@ar...>
commit 9d4a4ddd99ab607a107b05af387e9ee2d7ba444c
Author: Frieder Schrempf <fri...@ko...>
Date: Wed Aug 14 17:12:31 2019 +0200
imx8mm: Fix USB reg addresses for i.MX8MM
The i.MX8MM register addresses differ from i.MX8M in many ways. One
thing to fix is the USB addresses, wo make the USB controllers.
Singed-off-by: Frieder Schrempf <fri...@ko...>
commit 915a7db5b0d5167fdc9d94751f233d394681a6fd
Author: Ye Li <ye...@nx...>
Date: Wed May 8 00:10:57 2019 -0700
MLK-21889-7 EHCI: Enable iMX EHCI driver for iMX8M Nano
Add the IMX8MN to the EHCI-MX7 kconfig dependency.
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit 9e232b26b99790aa8f7717ed7f9bdf2a7422caac)
commit 40177b98ddb5eb83afef810e9f6a9525bc74d9a6
Author: Ye Li <ye...@nx...>
Date: Tue May 29 20:30:46 2018 -0700
MLK-18437-1 usb: ehci-mx6: fix board_usb_clean issue
The board_usb_clean in ehci-mx6 always set to HOST. This is wrong
when we running gadget. Change to use type in private data.
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit 47809d46abafd91c8fbb90393881f1daddd08af1)
(cherry picked from commit ec37a2cef2e4c0e627e36d684d8bf657e0772e9c)
commit 44e645136766249f4e7c5a45b29dcab6cd3df8db
Author: Ye Li <ye...@nx...>
Date: Fri May 11 01:26:30 2018 -0700
MLK-18290-2 ehci-mx6: Update driver to support i.MX8MM
Since the i.MX8MM reuses the otg controllers on i.MX7D. We can use
CONFIG_USB_EHCI_MX7 for them.
Due the TCPC and load switch are used on Typec circuit. Add the
board_usb_init and board_usb_cleanup to ehci-mx6 DM driver. So
we can implement the TCPC settings in these board functions.
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit 67699e88aed8bd36e919f54f9555ae15595faaf7)
commit 6fefc0152025baad977db93504fac8b9eeaf9460
Author: Ye Li <ye...@nx...>
Date: Wed Aug 9 04:54:53 2017 -0500
MLK-16175-1 usb: ehci-mx6: Turn on the power domain of USB PHY
Since there is no uclass for USB PHY. The device won't be setup for the USB PHY
node in DTB. And its associated power domain device won't be turned on neither
by DM framework.
This patch modifies the ehci-mx6 driver to enable the power domain device before
access the USB PHY. This is only for DM driver. For non-DM part, users still
need to power on the USB PHY in boards/SoC codes.
Signed-off-by: Ye Li <ye...@nx...>
Reviewed-by: Peng Fan <pen...@nx...>
(cherry picked from commit 3c59c8ea95d401d06736c68c186aec80e214bee8)
commit 0d5af8b92ad8efa32b6a15e1db2d63483fd34398
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 17 14:07:46 2020 +0100
dm: pinctrl: include linux/errno.h in pinctrl.h
Otherwise the compilation fails with PINCTRL_GENERIC=n :
In file included from drivers/pinctrl/nxp/pinctrl-imx8m.c:7:0:
include/dm/pinctrl.h: In function âpinctrl_generic_set_stateâ:
include/dm/pinctrl.h:319:10: error: âEINVALâ undeclared (first use in this function)
return -EINVAL;
^~~~~~
include/dm/pinctrl.h:319:10: note: each undeclared identifier is reported only once for each function it appears in
commit 868fb9969c85ce5a1b33c6bb713c8158c04acee9
Author: Tom Rini <tr...@ko...>
Date: Mon Jun 22 20:49:04 2020 -0400
Prepare v2020.07-rc5
Signed-off-by: Tom Rini <tr...@ko...>
commit f5a821459384a8fc1c8d0a44ce50f7f919257fa8
Merge: 2b8692bac1 10fa7ec9f6
Author: Tom Rini <tr...@ko...>
Date: Sat Jun 20 18:51:50 2020 -0400
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh
commit 2b8692bac1e8795cbb87b0d00213fd193409851d
Merge: 1e389a434a 0d7c2913fd
Author: Tom Rini <tr...@ko...>
Date: Fri Jun 19 14:22:23 2020 -0400
Merge tag 'efi-2020-07-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc5 (2)
Fix memory reservations: do not use random bytes from the stack.
commit 1e389a434aa9821330523002ee7b50d1147e0fef
Merge: d0cc022820 792919241b
Author: Tom Rini <tr...@ko...>
Date: Fri Jun 19 12:41:24 2020 -0400
Merge tag 'u-boot-stm32-20200619' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- fix SD card cart detect on DHCOM and ST boards
commit d0cc022820aef0d731840cfd42a22a4839c4d21d
Merge: 5c3cd8e2e1 7b4f42b6cd
Author: Tom Rini <tr...@ko...>
Date: Fri Jun 19 12:41:05 2020 -0400
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-tegra
commit 792919241b3d750cd5295dfe6dd1d0958b9be468
Author: Patrick Delaunay <pat...@st...>
Date: Fri Jun 19 11:19:45 2020 +0200
ARM: dts: stm32: Reinstate card detect behavior on ST boards
The cd-gpios with (GPIO_ACTIVE_LOW | GPIO_PULL_UP) gpio is thus far
unsupported, reinstate the old cd-gpios behavior until this handling
is fully implemented. This avoid potential issue for SDCard boot:
the card detect fails with floating gpio.
Signed-off-by: Patrick Delaunay <pat...@st...>
Reviewed-by: Patrice Chotard <pat...@st...>
commit 3c2e2a1a79608c5e046313a8c47586d9a734e2a3
Author: Marek Vasut <ma...@de...>
Date: Thu Jun 18 20:35:17 2020 +0200
ARM: dts: stm32: Reinstate card detect behavior on DHSOM
The cd-gpios with (GPIO_ACTIVE_LOW | GPIO_PULL_UP) gpio is thus far
unsupported, reinstate the old cd-gpios behavior until this handling
is fully implemented. This permits the DHSOM to boot from SD again,
without this patch the card detect fails.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Patrick Delaunay <pat...@st...>
Cc: Patrice Chotard <pat...@st...>
Reviewed-by: Patrick Delaunay <pat...@st...>
commit 0d7c2913fdf71d74e0d6c710dcceaa29f3862d8c
Author: Atish Patra <ati...@wd...>
Date: Thu Jun 18 18:51:50 2020 -0700
cmd: bootefi: Honor the address & size cells properties correctly
fdtdec_get_addr_size reads the uses a fixed value for address & size
cell properties which may not be correct always.
Use the auto variant of the function which automatically reads
#address-cells & #size-cells from parent and uses to read the "reg"
property.
Signed-off-by: Atish Patra <ati...@wd...>
On 32 bit systems fdt_addr_t may be 4 bytes long but size is defined as
u64. Avoid filling the upper 4 bytes of the sizep parameter of
fdtdec_get_addr_size_auto_parent() with random bytes from the stack by
defining a separate variable fdt_size.
Reviewed-by: Heinrich Schuchardt <xyp...@gm...>
commit 7b4f42b6cd5d8fa32f763b5ec03b7b8fdf7c4303
Author: Tom Warren <tw...@nv...>
Date: Mon May 11 16:38:58 2020 -0700
t210: Nano: Add NVME support
This allows Nano to use the key M.2 on the CVB to connect and use a M.2
NVMe SSD stick. Works on my Nano B00, WD SN750 NVMe SSD shows up
w/'nvme' commands. Will add booting from NVMe via distro cmds in a future
patch.
Signed-off-by: Tom Warren <tw...@nv...>
commit 5c3cd8e2e1f956b74cbf6f145db6db518241a113
Merge: 717e779f6e 1099b2abef
Author: Tom Rini <tr...@ko...>
Date: Thu Jun 18 18:00:05 2020 -0400
Merge tag 'fixes-for-v2020.07-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- fix stdout in default environment for apalis_imx6, colibri_imx6
and cm_fx6 boards
commit c46443dd85cb1ebb329ce733018d4a04babe2f25
Author: Igor Opaniuk <igo...@to...>
Date: Mon Apr 13 18:11:42 2020 +0300
colibri_t20: change maintainer
Take over maintainership for Colibri T20 module.
Signed-off-by: Igor Opaniuk <igo...@to...>
Acked-by: Lucas Stach <de...@ly...>
commit 1ec74533840650b914ccdf9f62a298ecb29994ab
Author: Jon Hunter <jon...@nv...>
Date: Thu Jun 18 12:54:39 2020 +0100
ARM: tegra: Enable PSCI support for Tegra210 and Tegra186
The PSCI nodes are currently not populated for the Tegra210 and Tegra186
devices. This prevents the PSCI driver from being able to identify the
PSCI method used by these devices and causes the probe of the PSCI
driver to fail.
Since commit 81ea00838c68 ("efi_loader: PSCI reset and shutdown") was
added, which moves the PSCI EFI system reset handler into the PSCI
driver, this has prevented the EFI system reset from working for
Tegra210 and Tegra186. Therefore, populating these nodes is necessary
to fix the EFI system reset for Tegra210 and Tegra186.
Signed-off-by: Jon Hunter <jon...@nv...>
Tested-by: Peter Robinson <pbr...@gm...>
commit fb264efbd2fef45ca96630c355cbe30957132f3f
Author: Jon Hunter <jon...@nv...>
Date: Thu Jun 18 12:54:38 2020 +0100
firmware: PSCI: Fix PSCI support for OF live trees
When CONFIG_OF_LIVE is enabled, dev_of_offset() cannot be used and
if used returns an invalid offset. This causes the call to
fdt_stringlist_get() in the psci_probe() to fail to read the 'method'
property from the PSCI node for the device and hence prevents PSCI
from working. Fix this by using the ofnode_read_string() API instead
of the fdt_stringlist_get() because this will handle reading the
property both when CONFIG_OF_LIVE is enabled or disabled.
Due to the above problem and since commit 81ea00838c68 ("efi_loader:
PSCI reset and shutdown") was added, the EFI system reset has been
broken for Tegra210 and Tegra196 platforms. This also fixes the EFI
system reset for these Tegra platforms.
Signed-off-by: Jon Hunter <jon...@nv...>
Tested-by: Peter Robinson <pbr...@gm...>
commit 717e779f6e2e14a876e5965a455604ab966f1f26
Author: Tom Rini <tr...@ko...>
Date: Thu Jun 18 13:51:39 2020 -0400
Azure/GitLab: Move to latest Docker image
- Add guestfstools, efitools
- Latest Ubuntu/bionic snapshot
Signed-off-by: Tom Rini <tr...@ko...>
commit 10fa7ec9f64dec9bc90e85e37248eabfb9b44bf2
Author: Marek Vasut <mar...@gm...>
Date: Sun Jun 14 14:41:07 2020 +0200
ARM: rmobile: Increase PHY auto-negotiation timeout to 20s
The ethernet PHY on all known Gen3 boards takes a while to come out
of reset, increase the auto-negotiation timeout to prevent it from
timing out in case the ethernet is used right after the board was
reset.
Signed-off-by: Marek Vasut <mar...@gm...>
Cc: Nobuhiro Iwamatsu <iwa...@ni...>
commit 1099b2abef35c3c887f6afac1a8ef18c7924d5d2
Author: Anatolij Gustschin <ag...@de...>
Date: Tue May 26 10:50:17 2020 +0200
colibri_imx6: fix video stdout in default environment
After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.
Signed-off-by: Anatolij Gustschin <ag...@de...>
Acked-by: Igor Opaniuk <igo...@to...>
commit d8c37c63098ee6133739c94230dd4f283c481543
Author: Anatolij Gustschin <ag...@de...>
Date: Tue May 26 10:43:44 2020 +0200
apalis_imx6: fix video stdout in default environment
After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.
Signed-off-by: Anatolij Gustschin <ag...@de...>
Acked-by: Igor Opaniuk <igo...@to...>
commit f94e54811a74a2e0589bef6a11ebf488f86d1dd3
Author: Anatolij Gustschin <ag...@de...>
Date: Tue May 26 10:52:00 2020 +0200
cm_fx6: fix video stdout in default environment
After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.
Signed-off-by: Anatolij Gustschin <ag...@de...>
Cc: Nikita Kiryanov <ni...@co...>
commit 0b3a92dfa3639167e8d1e40f524b5b094fbcd357
Merge: 9cb895203a 9c55f5d112
Author: Tom Rini <tr...@ko...>
Date: Thu Jun 18 09:46:55 2020 -0400
Merge tag 'u-boot-amlogic-20200618' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- move amlogic board documentation into doc/board in RsT format
commit 9c55f5d11260c5aa0f91d8cb32aa0ad00910659d
Author: Neil Armstrong <nar...@ba...>
Date: Thu Jun 11 10:57:39 2020 +0200
board: amlogic: add board doc files to MAINTAINERS
Add the recently added reStructuredText board documentation in the
appropriate MAINTAINERS files.
Signed-off-by: Neil Armstrong <nar...@ba...>
commit 0ce3639d6f612d3fc215474a45075717d4e7aaa8
Author: Neil Armstrong <nar...@ba...>
Date: Thu Jun 11 10:53:49 2020 +0200
board: amlogic: move boards doc into doc/board/amlogic
Move the natural text Amlogic board README files to doc/board/amlogic
into reStructuredText and :
- add reStructuredText markup for bash code
- fix secondary titles markup
- move board support into global support matrix
Signed-off-by: Neil Armstrong <nar...@ba...>
commit 9cb895203a46654f7ee6dd95be5c8ab05e4dfbd3
Merge: c622afb087 9e69696506
Author: Tom Rini <tr...@ko...>
Date: Tue Jun 16 09:18:56 2020 -0400
Merge tag 'u-boot-stm32-20200616' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- fix boot with OP-TEE for stm32mp15 boards
commit 9e696965065c43b59901e49e75435b1549fa55c7
Author: Etienne Carriere <eti...@li...>
Date: Fri Jun 5 09:24:30 2020 +0200
dts: ARM: stm32mp15: add OP-TEE node in u-boot DTSI
Add OP-TEE firmware node in stm32mp15 U-Boot DTSI. This node is
needed since commit [1] that changed U-Boot/stm32mp15 to detect
OP-TEE availability by probing the resource instead of relying on
U-Boot configuration. The software sequence implemented by [1] is
fine but U-Boot DTS/DTSI files were not updated accordingly since,
hence OP-TEE presence is never detected by U-Boot, preventing Linux
kernel from using OP-TEE resources.
For consistency and to synchronize stm32mp15 DTSI files (excluding
U-Boot specific DTSI files) with the Linux kernel ones, this change
also moves the OP-TEE reserved memory nodes from board generic DTSI
files to U-Boot specific board DTSI files.
Link: [1] commit 43df0a159df6 ("stm32mp1: dynamically detect op-tee presence")
Signed-off-by: Etienne Carriere <eti...@li...>
Signed-off-by: Patrick Delaunay <pat...@st...>
Reviewed-by: Patrice Chotard <pat...@st...>
commit 164873a0c02ddbc9a59ad3a0670f17684fc00737
Author: Etienne Carriere <eti...@li...>
Date: Fri Jun 5 09:24:29 2020 +0200
board: stm32mp1: fix handling of DT OP-TEE reserved memory nodes
Fix the sequence in stm32mp1 fdt.c that disables OP-TEE resources
defined in FDT when U-boot detects OP-TEE firmware is not present.
Before this change, helper function stm32_fdt_disable_optee()
set property status to "disabled" for the OP-TEE reserved memory
nodes but this has no impact since Linux kernel does not consider
the status property for reserved-memory subnodes. This change
make U-Boot to attempt to delete the node instead.
Fixes: 4a1b975dac02 ("board: stm32mp1: reserve memory for OP-TEE in device tree")
Signed-off-by: Etienne Carriere <eti...@li...>
Signed-off-by: Patrick Delaunay <pat...@st...>
Reviewed-by: Patrice Chotard <pat...@st...>
commit c622afb0874e57cd7e9df51855e35286fa46aab7
Merge: e88d6979d1 4bb4249b39
Author: Tom Rini <tr...@ko...>
Date: Mon Jun 15 16:44:58 2020 -0400
Merge tag 'efi-2020-07-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc5
Use correct printf code in efi_image_parse().
Add random number generation to HTML documentation.
commit e88d6979d1fa0a11468204fa729229afc49d5bde
Author: Mark Kettenis <ket...@op...>
Date: Mon Apr 27 11:09:47 2020 +0200
regulator: fix: enable gpio when requested
The fix in commit b7adcdd073c0 has the side-effect that the regulator
will be disabled when requesting the relevant gpio in
regulator_common_ofdata_to_platdata() and enabled in
regulator_pre_probe() when the regulator was already enabled.
This leads to a short interruption in the 3.3V power to the PCIe
slot on the firefly-rk3399 which makes an ADATA SX8000NP NVMe SSD
unhappy.
Fix this by setting the GPIOD_IS_OUT_ACTIVE flag again when the
'regulator-boot-on' property is set, but check for this property
explicitly instead of relying on the "boot_on" member of
the uclass platdata.
Signed-off-by: Mark Kettenis <ket...@op...>
Tested-by: Patrice Chotard <pat...@st...>
commit 287be3294af6179782f8a561afca427620504581
Merge: bb1ff1371e 35c2683f46
Author: Tom Rini <tr...@ko...>
Date: Mon Jun 15 11:24:42 2020 -0400
Merge branch '2020-06-15-misc-bugfixes'
- Assorted bug fixes
commit 35c2683f46bdea96f1dfce404aee4369a824b68e
Author: Patrick Delaunay <pat...@st...>
Date: Wed Jun 10 19:28:42 2020 +0200
env: Kconfig: cosmetics: update comment for SYS_RELOC_GD_ENV_ADDR
Update the comment for SYS_RELOC_GD_ENV_ADDR as gd->env_addr is updated
in board_r.c::initr_reloc_global_data() under the compilation flags
CONFIG_SYS_RELOC_GD_ENV_ADDR
Signed-off-by: Patrick Delaunay <pat...@st...>
Reviewed-by: Tom Rini <tr...@ko...>
commit 5b60326b6e52a59c13e3a8f94622cb5ebbecb54c
Author: Heinrich Schuchardt <xyp...@gm...>
Date: Sun Jun 7 11:54:00 2020 +0200
config: qemu: increase SYS_MALLOC_F_LEN
Several configutation options require additional memory before relocation:
* CONSOLE_RECORD
* LOG
* RSA
The current default of 0x400 is too small to encompass them all. Increase
the value of SYS_MALLOC_F_LEN to 0x2000 for ARCH_QEMU.
Signed-off-by: Heinrich Schuchardt <xyp...@gm...>
commit 1fae74125b644bb7f21e4afef3b9084c58e7863a
Author: Sean Anderson <se...@gm...>
Date: Sun Jun 7 01:36:45 2020 -0400
Revert "lib: Improve _parse_integer_fixup_radix base 16 detection"
This reverts commit 0486497e2b5f4d36fa968a1a60fea358cbf70b65.
The strtoul has well-defined semantics. It is defined by the C standard and
POSIX. To quote the relevant section of the man pages,
> If base is zero or 16, the string may then include a "0x" prefix, and the
> number will be read in base 16; otherwise, a zero base is taken as 10
> (decimal) unless the next character is '0', in which case it is taken as
> 8 (octal).
Keeping these semantics is important for several reasons. First, it is very
surprising for standard library functions to behave differently than usual.
Every other implementation of strtoul has different semantics than the
implementation in U-Boot at the moment. Second, it can result in very
surprising results from small changes. For example, changing the string
"1f" to "20" causes the parsed value to *decrease*. Forcing use of the "0x"
prefix to specify hexidecimal numbers is a feature, not a bug. Lastly, this
is slightly less performant, since the entire number is parsed twice.
This fixes the str_simple_strtoul test failing with
test/str_ut.c:29, run_strtoul(): expect_val == val: Expected 0x44b (1099), got 0x1099ab (1087915)
test/str_ut.c:46, str_simple_strtoul(): 0 == run_strtoul(uts, str2, 0, 1099, 4): Expected 0x0 (0), got 0x1 (1)
Signed-off-by: Sean Anderson <se...@gm...>
CC: Michal Simek <mic...@xi...>
CC: Shiril Tichkule <sh...@xi...>
Reviewed-by: Simon Glass <sj...@ch...>
commit a633a804a2a32693180ef156ed1a2dbc70b6d392
Author: Michal Simek <mic...@xi...>
Date: Fri Jun 5 11:45:12 2020 +0200
trivial: Fix booot occurences
s/booot/boot/g
The first ase is booot instead of boot and second u-booot instead of
u-boot.
Signed-off-by: Michal Simek <mic...@xi...>
Reviewed-by: Jaehoon Chung <jh8...@sa...>
commit 05f0c746069fc950243c108ac90bc1a221c903c5
Author: Etienne Carriere <eti...@li...>
Date: Fri Jun 5 09:22:11 2020 +0200
optee: fix copy of optee reserved-memory node
Fix the loop that parses FDT for a reserved memory node named "optee".
Before this change, if at least one subnode was found in the
reserved-memory node, the function endlessly looped since instruction
continue returned back in the loop without updating variable subnode.
This change fixes the issue by using a for loop.
Fixes: 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
Signed-off-by: Etienne Carriere <eti...@li...>
Signed-off-by: Patrick Delaunay <pat...@st...>
commit bb1ff1371e23c699700a53a53b7c30c310b285fa
Merge: 07672c478e 50a17a69be
Author: Tom Rini <tr...@ko...>
Date: Mon Jun 15 10:20:35 2020 -0400
Merge tag 'mmc-2020-6-15' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- fsl_esdhc sdr104 and hs200 fix and error path fix
- fsl_esdhc workaround 3.3v io issue
- ca_dw_mmc cleanup
- presidio-asic emmc DT update.
commit 50a17a69be076316e4c539b75403acfabf9e4c4c
Author: Marek Vasut <ma...@de...>
Date: Fri May 22 18:28:33 2020 +0200
mmc: fsl_esdhc: Gracefully fail on unsupported voltage switch
Unsupported voltage on voltage switch is not an error, do not
print error message in such a case. This happens e.g. if the
eMMC is already in 1V8 mode or when testing 1V2 mode operation
on systems which only do 3V3/1V8 switching.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fab...@nx...>
Cc: Jaehoon Chung <jh8...@sa...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
Reviewed-by: Jaehoon Chung <jh8...@sa...>
commit 406df85345f942d9348443983d81a01e013e920b
Author: Marek Vasut <ma...@de...>
Date: Fri May 22 18:19:08 2020 +0200
mmc: fsl_esdhc: Fix SDR104 and HS200 support
The 3V3/1V8 switching could never have worked on any of the iMXes
ever since 51313b49f2 ("mmc: fsl_esdhc: support SDR104 and HS200"),
because that commit uses priv->vqmmc_dev when switching voltages on
mode switch, while local vqmmc_dev in probe to store the regulator
pointer. Those are two different variables with the same name. So
the priv->vqmmc_dev was always NULL and thus voltage switch between
modes never really suceeded.
Fix this by assigning priv->vqmmc_dev with value of the vqmmc_dev
in probe.
Fixes: 51313b49f2 ("mmc: fsl_esdhc: support SDR104 and HS200")
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fab...@nx...>
Cc: Jaehoon Chung <jh8...@sa...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
Reviewed-by: Jaehoon Chung <jh8...@sa...>
commit 1ac64476440ee293e51f03d5b612b2b44b059976
Author: Alex Nemirovsky <ale...@co...>
Date: Thu May 21 17:24:23 2020 -0700
board: presidio-asic: update eMMC DT information
Change DT compatibility name to match change in driver's name.
Remove unused io_ds and fifo_mode fields from DT.
Signed-off-by: Alex Nemirovsky <ale...@co...>
CC: Peng Fan <pen...@nx...>
CC: Jaehoon Chung <jh8...@sa...>
CC: Tom Rini <tr...@ko...>
commit dbd8a8dfe7fa03300bd8d56b1d1e87d1089550b5
Author: Arthur Li <art...@co...>
Date: Thu May 21 17:24:22 2020 -0700
mmc: ca_dw_mmc: Misc cleanup of driver
- Rename DT compatible name
- Remove uneccessary if-statement to support 8-bit buswidth
- Remove redundant error msg
- Use symbolic constants in switch statement
Signed-off-by: Arthur Li <art...@co...>
Signed-off-by: Alex Nemirovsky <ale...@co...>
CC: Peng Fan <pen...@nx...>
CC: Jaehoon Chung <jh8...@sa...>
CC: Tom Rini <tr...@ko...>
commit c927d65873c7706f436ab59a78d44a0eb80fe939
Author: Yangbo Lu <yan...@nx...>
Date: Tue May 19 11:06:44 2020 +0800
mmc: fsl_esdhc: workaround for hardware 3.3v IO reliability issue
When eSDHC operates at 3.3v, damage can accumulate in an internal
level shifter at a higher than expected rate. The faster the interface
runs, the more damage accumulates. This issue now is found on LX2160A
eSDHC1 for only SD card.
The hardware workaround is recommended to use an on-board level shifter
that is 1.8v on SoC side and 3.3v on SD card side.
For boards without hardware workaround, this option could be enabled,
ensuring 1.8v IO voltage and disabling eSDHC if no card.
This option assumes no hotplug, and u-boot has to make all the way to
to linux to use 1.8v UHS-I speed mode if has card.
If you do not want the workaround for better user experience, of course
you can choose to not select it running eSDHC in unsafe mode.
Signed-off-by: Yangbo Lu <yan...@nx...>
Acked-by: Peng Fan <pen...@nx...>
commit 9abf648436b49553e6cb4a7f03a021720616d75b
Author: Yangbo Lu <yan...@nx...>
Date: Tue May 19 11:06:43 2020 +0800
mmc: fsl_esdhc: read register once for card inserted status
No need to poll register for card inserted status.
Signed-off-by: Yangbo Lu <yan...@nx...>
Acked-by: Peng Fan <pen...@nx...>
commit 4bb4249b39ce7284408c4d604a656be941427e63
Author: Heinrich Schuchardt <xyp...@gm...>
Date: Sat Jun 6 13:17:48 2020 +0200
efi_loader: printf code in efi_image_parse()
For size_t we have to use %zu for printing not %lu.
Fixes: 4540dabdcaca ("efi_loader: image_loader: support image
authentication")
Signed-off-by: Heinrich Schuchardt <xyp...@gm...>
commit c7ff87e0ae3e619b5718eafcdee433af0a46df8b
Author: Heinrich Schuchardt <xyp...@gm...>
Date: Sat Jun 13 12:29:52 2020 +0200
doc: random number generation
Add random number generation APIs to the HTML documentation.
Fix style issues.
Signed-off-by: Heinrich Schuchardt <xyp...@gm...>
commit 07672c478e3a6aa0ac2ddb5b05a181b1025fd759
Merge: 18d8977bdf 65f7551b6e
Author: Tom Rini <tr...@ko...>
Date: Sun Jun 14 12:01:14 2020 -0400
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-usb
- eth/r8152: update the firmware
commit 18d8977bdff65cf895ff2a3df7d93de88913e4d1
Merge: 9d886fd6a0 a0bda1dd83
Author: Tom Rini <tr...@ko...>
Date: Sun Jun 14 12:00:50 2020 -0400
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga
- cyclone5 bugfix
commit a0bda1dd8382be57389833024ba40518ec098ac3
Author: Ley Foon Tan <ley...@in...>
Date: Wed Jun 10 13:24:16 2020 +0800
arm: dts: socfpga: cyclone5: Update i2c-scl-falling-time-ns
Commit e71b6f6622d6 ("i2c: designware_i2c: Rewrite timing calculation")
change the hcnt and lcnt timing calculation. New timing calculation is
based on calculation from Designware i2c databook.
After this new timing calculation, hcnt will have negative value
with i2c-scl-falling-time-ns 5000 that set in socfpga_cyclone5_socdk.dts.
This patch overwrite i2c-scl-falling-time-ns to 300ns (default SCL fall
time used in Designware i2c driver) for Uboot.
Before the fix:
=> i2c dev 0
Setting bus to 0
Failure changing bus number (-22)
After the fix:
=> i2c dev 0
Setting bus to 0
=> i2c probe
Valid chip addresses: 17 51 55 5B 5C 5E 66 68 70
Signed-off-by: Ley Foon Tan <ley...@in...>
commit 65f7551b6e8e389ae6a6b43ccfd18da31258a9ba
Author: Hayes Wang <hay...@re...>
Date: Fri Jun 5 15:23:40 2020 +0800
eth/r8152: update the firmware
Update the firmware to improve compatibility for none-intel USB
host controller. The more information is as following.
The device has auto-installed driver feature - via switch CD-ROM/NIC
mode. But in some corner cases, it would switch to CD-ROM unexpected.
This issue results in Lan Function Disabled.
While USB PHY transits to P3 from P0 due to the absent of transmitter
control, it would issues undefined signal to its link partner.
Some Down Stream Port misidentify the undefined signal as wakeup
signal. So the link state will not keep in suspend even the system
is idle.
Signed-off-by: Hayes Wang <hay...@re...>
commit 9d886fd6a0888f121cd280d11434812a386045a2
Merge: be79009f3b b45926fa1d
Author: Tom Rini <tr...@ko...>
Date: Fri Jun 12 17:20:35 2020 -0400
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- Drop davinci, mxs spi nondm code
- Zap nondm soft_spi
- Switch few board to DM_SPI
- Drop omap3_pandora, pcm051 boards
commit b45926fa1d5a1be2a55d0eb208bff8f04f00f875
Author: Jagan Teki <ja...@am...>
Date: Wed May 27 18:26:16 2020 +0530
am335x: sl50: Enable DM_SPI
Enable DM_SPI for am355x sl50 board.
Build is fine, but not tested.
Cc: Enric Balletbo i Serra <enr...@co...>
Signed-off-by: Jagan Teki <ja...@am...>
Reviewed-by: Enric Balletbo i Serra <enr...@co...>
commit 07b3e8dd387387e68c465ebce236b8b98110702f
Author: Jagan Teki <ja...@am...>
Date: Wed May 27 18:26:15 2020 +0530
configs: igep00x0: Enable DM_SPI
Enable DM_SPI for igep00x0 board.
Build is fine, but not tested.
Cc: Enric Balletbo i Serra <eba...@gm...>
Signed-off-by: Jagan Teki <ja...@am...>
Reviewed-by: Enric Balletbo i Serra <enr...@co...>
commit 64efd11d3b0fcb70008899920ed224916e1da9cc
Author: Jagan Teki <ja...@am...>
Date: Mon Jun 1 18:49:45 2020 +0530
arm: Remove pcm051 board
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Remove it.
Acked-by: Lars Poeschel <poe...@le...>
Signed-off-by: Jagan Teki <ja...@am...>
commit a9c84ffa99471e3f48ab6a516eb5d02f5ea4a8f3
Author: Jagan Teki <ja...@am...>
Date: Mon Jun 1 18:47:52 2020 +0530
arm: Remove omap3_pandora_defconfig board
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.
Remove it.
Acked-by: Grazvydas Ignotas <no...@gm...>
Signed-off-by: Jagan Teki <ja...@am...>
commit 807f0ff68a9afe9667745d18e647e5ef2231520f
Author: Jagan Teki <ja...@am...>
Date: Tue May 26 13:34:26 2020 +0530
spi: davinci: Drop non-dm code
Now all boards which are using davinci SPI driver
have moved to SPL_DM so drop the unneeded non-dm code.
Cc: Adam Ford <afo...@gm...>
Signed-off-by: Jagan Teki <ja...@am...>
Tested-by: Adam Ford <afo...@gm...> #da850-evm
commit 31d40e5acca24fa24ee7fd88fe01ce8f55e9aff6
Author: Jagan Teki <ja...@am...>
Date: Tue May 26 13:34:25 2020 +0530
ks2_evm: Switch to DM_SPL, SPL_OF_CONTROL
This would make SPL build to DM_SPL, SPL_OF_CONTROL.
Build fine with but not tested.
Cc: Vitaly Andrianov <vi...@ti...>
Signed-off-by: Jagan Teki <ja...@am...>
commit beeb34ac0cc68bf92b25d4343dce27f19bc4275e
Author: Jagan Teki <ja...@am...>
Date: Wed May 27 23:03:33 2020 +0530
spi: atmel: Drop atmel_spi.h
atmel_spi.h has register offsets, and atmel_spi_slave
structure, move it into .c file for better readability
and drop atmel_spi.h
Cc: Wenyou Yang <wen...@at...>
Signed-off-by: Jagan Teki <ja...@am...>
commit 0984500146485a404148b6f3d773453c7d3e1b1c
Author: Jagan Teki <ja...@am...>
Date: Wed May 27 22:59:12 2020 +0530
spi: atmel: Remove nondm code
atmel spi driver now accessible only when DM_SPI enabled.
So, remove nondm code.
Cc: Wenyou Yang <wen...@at...>
Signed-off-by: Jagan Teki <ja...@am...>
commit a9d3cab8a4124cc3f2b16accf90087795cf60fba
Author: Jagan Teki <ja...@am...>
Date: Wed May 27 22:50:47 2020 +0530
spi: atmel: Drop CONFIG_SYS_SPI_WRITE_TOUT
Drop CONFIG_SYS_SPI_WRITE_TOUT there is no code usage.
Cc: Wenyou Yang <wen...@at...>
Signed-off-by: Jagan Teki <ja...@am...>
commit 62b02a663401191ffda26ccceb694f38d75393d7
Author: Jagan Teki <ja...@am...>
Date: Mon May 25 23:40:11 2020 +0530
spi: fsl_dspi: Drop nondm code
Drop the nondm code from fsl_dspi.c since there
is no board or any other code using for it.
Signed-off-by: Jagan Teki <ja...@am...>
commit 726c0343a8f3f0496e51da7e5d550aa982c9f288
Author: Jagan Teki <ja...@am...>
Date: Tue May 26 08:34:37 2020 +0530
spi: Zap SOFT_SPI (non-dm)
- Deadline for DM migration already passed by months.
- Sent couple of zap patches and
- No response on dm conversation
hence removed the driver.
Signed-off-by: Jagan Teki <ja...@am...>
Reviewed-by: Simon Glass <sj...@ch...>
commit 7e07b3727763e14296fa6846df041a24d99a753e
Author: Jagan Teki <ja...@am...>
Date: Mon May 25 23:31:59 2020 +0530
spi: mxs: Code cleanup
Order the macros, private structures and simple functions
in a proper way to have more code readability.
No functionality changed.
Signed-off-by: Jagan Teki <ja...@am...>
commit c9a9823f260292c4ff97201ce45eebd45abce0ce
Author: Jagan Teki <ja...@am...>
Date: Mon May 25 23:24:23 2020 +0530
spi: mxs: Drop nondm code
Deadline for DM migration already passed by months
and no response on full dm conversation hence removed
the nondm code.
Note: Look like there is no user for nondm code
for this driver.
Signed-off-by: Jagan Teki <ja...@am...>
commit be79009f3b9bbdbce283e67a865121e576d790ea
Merge: e411a090cf 3854296801
Author: Tom Rini <tr...@ko...>
Date: Tue Jun 9 09:17:24 2020 -0400
Merge tag 'u-boot-imx-20200609' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.07
-----------------
- mx53: mx53menlo Convert to DM_ETH, fix fail boot
- imx8mp_evk: fix boot issue
- MX6, display5: fix environment
- drop warnings (watchdog) for i.MX8mm i.mx8mp
- enable bootaux for i.MX8M
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/695929999
commit 385429680106f8612386e26564f69dccdd110620
Author: Stefano Babic <sb...@de...>
Date: Tue Jun 9 11:19:55 2020 +0200
Revert "imx: rom api: fix image offset computation"
This reverts commit 1f63ee656698724bcdc4e711b4ccd267f6bf64ab.
As reported by Ye Li on ML:
1. Removing the image_offset will break secondary (redundant) boot support for sd and emmc.
2. When booting from emmc boot partition, the image_offset is 0. But the flash.bin
generated by mkimage with imximage-8mp-lpddr4.cfg is for sd. It expects to be burn at 32KB offset.
The fit offset 0x60000 has already included the 32KB offset. So when you burn this flash.bin
to emmc boot partition at offset 0, the fit offset should subtract the 32KB (0x60000 - 0x8000).
Signed-off-by: Stefano Babic <sb...@de...>
commit a13644c065173fad6bcaf163569bd01e6eb93834
Author: Marek Vasut <ma...@de...>
Date: Sat May 30 22:44:46 2020 +0200
ARM: dts: imx: m53menlo: Convert to DM_ETH
Convert the board to DM_ETH instead of legacy networking. This requires
a minor addition to the DT to satisfy the requirement for specifying a
PHY node. No functional change from board user perspective.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fes...@gm...>
Cc: NXP i.MX U-Boot Team <ubo...@nx...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
commit dae6cb8fb757fa13d9f894a67443a7ea7e93c6bc
Author: Marek Vasut <ma...@de...>
Date: Sat May 30 22:44:45 2020 +0200
ARM: imx: m53menlo: Do not fail boot on invalid splash screen
None of these splash screen loading errors are so critical as to
justify complete failure to boot, so just print error message as
needed and return 0, the boot can very likely continue without
the splash.
Fix a couple of missing free(dst) instances as well.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fes...@gm...>
Cc: NXP i.MX U-Boot Team <ubo...@nx...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
commit 0e06d63d195670f5181958f43216d7106c05357f
Author: Marek Vasut <ma...@de...>
Date: Sat May 30 02:14:48 2020 +0200
ARM: imx: ddr: Add missing PHY reset
The iMX7D RM 9.2.4.9.3 Power removal flow Table 9-11. Re-enabling power
explicitly says both the DDR controller and the PHY must be reset in the
correct sequence. Currently the code only resets the controller. This
leads to a misbehavior where the system brings the DRAM up after reboot,
but the DRAM is unstable. Add the missing reset.
The easiest way to trigger this is by triggering WDT without having the
WDT assert WDOG_B signal, i.e. mw.w 0x30280000 0x25 .
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fes...@gm...>
Cc: NXP i.MX U-Boot Team <ubo...@nx...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
commit 661d9afe1429e28adcaacd277ab9f28e3790e93f
Author: Marek Vasut <ma...@de...>
Date: Fri May 29 19:22:41 2020 +0200
power: pmic: Add SPL Kconfig entry for PFUZE100
Add Kconfig entry for the PFUZE PMIC, SPL variant.
Signed-off-by: Marek Vasut <ma...@de...>
Cc: Fabio Estevam <fab...@nx...>
Cc: Jaehoon Chung <jh8...@sa...>
Cc: Peng Fan <pen...@nx...>
Cc: Stefano Babic <sb...@de...>
Reviewed-by: Jaehoon Chung <jh8...@sa...>
commit 28fff3fa1c7abb09888585252147e35496074880
Author: Peng Fan <pen...@nx...>
Date: Tue May 26 20:33:50 2020 -0300
imx: imx8mp_evk: fix boot issue
The u-boot-spl.bin pad with ddr firmware conflicts with the
CONFIG_MALLOC_F_ADDR area, the ddr firmware will be overwritten
by malloc in SPL stage and cause ddr initialization not able
to finish. So update the related addresses to fix the issue.
Reported-by: Fabio Estevam <fes...@gm...>
Signed-off-by: Peng Fan <pen...@nx...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit 0ec9d5bda93e0203405ffff134ce7b2d7fbda6aa
Author: Peng Fan <pen...@nx...>
Date: Tue May 26 20:33:49 2020 -0300
imx8mp_evk: spl: no need the code since spl framework could do that
We no need invoke the code, since spl framework could help
us do that.
Signed-off-by: Peng Fan <pen...@nx...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit bdada3b14d554b029ec0406ca04cd54482c20d81
Author: Peng Fan <pen...@nx...>
Date: Tue May 26 20:33:48 2020 -0300
imx8mp_evk: spl: use spl_early_init
Use spl_early_init to replace spl_init, spl_init will be invoked
in board_init_r, we only need use spl_early_init to setup malloc
and scan early dt.
Signed-off-by: Peng Fan <pen...@nx...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit ebdd07f5b2e4b00eee7f8630b3b026a65c3f51c4
Author: Peng Fan <pen...@nx...>
Date: Tue May 26 20:33:47 2020 -0300
imx8mp_evk: spl: drop timer_init
timer_init has been invoked in arch_cpu_init, no need to invoke
it again in board code.
Signed-off-by: Peng Fan <pen...@nx...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit 87f6e2f51e337623b1794e916d8b8eb654736c0d
Author: Peng Fan <pen...@nx...>
Date: Tue May 26 20:33:46 2020 -0300
imx8mp_evk: spl: drop useless code
Drop useless getting ccm device, there is no need to explicted do this
in board code, and we not enable SPL CLK currently.
Signed-off-by: Peng Fan <pen...@nx...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit c04b41b3299d7d82c4b991a200bef137d4991a85
Author: Lukasz Majewski <lu...@de...>
Date: Wed May 13 17:45:15 2020 +0200
imx: Update MTD partitions layout for display5 (i.MX6Q) board
This change updates the MTD partition layout on SPI-NOR memory for display5
board.
Signed-off-by: Lukasz Majewski <lu...@de...>
commit 1f63ee656698724bcdc4e711b4ccd267f6bf64ab
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 13 16:02:28 2020 +0200
imx: rom api: fix image offset computation
When not booting from FlexSPI, the offset computation is:
offset = image_offset + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8000;
When booting from SD card or eMMC user partition, image_offset is
0x8000. It is useless to add and remove 0x8000.
When booting from other device, image_offset is 0 so this computation is wrong.
Simplfy this computation to work on all booting devices.
Signed-off-by: Sébastien Szymanski <seb...@ar...>
commit 2c72bf21c66692cf0b9c305c27ac4a5218a4dd01
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 11:00:31 2020 -0300
verdin-imx8mm: Select the watchdog driver
Currently watchdog driver is not selected, which causes system to reboot
after staying 60s in the U-Boot prompt.
Fix this problem by enabling CONFIG_WATCHDOG so that watchdog can be
properly serviced.
Signed-off-by: Fabio Estevam <fes...@gm...>
Acked-by: Igor Opaniuk <igo...@to...>
commit 51c0e493c2a97c51f5ee5b83c63d326bcf41cff4
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 11:00:30 2020 -0300
imx8mp_evk: Select the watchdog driver
Currently watchdog driver is not selected, which causes system to reboot
after staying 60s in the U-Boot prompt.
Fix this problem by enabling CONFIG_WATCHDOG so that watchdog can be
properly serviced.
Signed-off-by: Fabio Estevam <fes...@gm...>
commit 979d5e4bf674f7f676b9d116b526c7e422a2238e
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 11:00:29 2020 -0300
imx8mm_beacon: Select the watchdog driver
Currently watchdog driver is not selected, which causes system to reboot
after staying 60s in the U-Boot prompt.
Fix this problem by enabling CONFIG_WATCHDOG so that watchdog can be
properly serviced.
Signed-off-by: Fabio Estevam <fes...@gm...>
Reviewed-by: Adam Ford <afo...@gm...>
commit 010bd4718b9ef1cfe39f7be8ef4ee4c56d6b1edb
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 11:00:28 2020 -0300
imx8mn_ddr4_evk: Select the watchdog driver
Currently watchdog driver is not selected, which causes system to reboot
after staying 60s in the U-Boot prompt.
Fix this problem by enabling CONFIG_WATCHDOG so that watchdog can be
properly serviced.
Signed-off-by: Fabio Estevam <fes...@gm...>
commit c5a015c32e46632b9d593402951feface11ca66b
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 11:00:27 2020 -0300
imx8mm_evk: Select the watchdog driver
Currently the watchdog driver is not selected, which causes the following
warnings in both SPL and U-Boot proper:
U-Boot SPL 2020.07-rc1-00387-g67887903af (May 07 2020 - 23:49:27 -0300)
Normal Boot
WDT: Started without servicing (60s timeout)
Trying to boot from MMC1
U-Boot 2020.07-rc1-00387-g67887903af (May 07 2020 - 23:49:27 -0300)
CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz
Reset cause: POR
Model: FSL i.MX8MM EVK board
DRAM: 2 GiB
WDT: Started without servicing (60s timeout)
....
System reboots after staying 60s in the U-Boot prompt.
Fix this problem by enabling CONFIG_WATCHDOG so that watchdog can be
properly serviced.
Suggested-by: Marek Vasut <ma...@de...>
Signed-off-by: Fabio Estevam <fes...@gm...>
commit 9ccd30df609db2186fc27c107bb905a51197e221
Author: Fabio Estevam <fes...@gm...>
Date: Mon May 11 09:45:51 2020 -0300
imx8mp_evk: Add a README file
Add a README file explaining the U-Boot build and SD card flash procedures.
Signed-off-by: Fabio Estevam <fes...@gm...>
commit 0e9c045b2b6a0409d650dd39265b4f6924a69832
Author: Patrick Wildt <pa...@bl...>
Date: Fri May 8 11:59:47 2020 +0200
imx: move ATF to the back of the FIT to fix loading over yModem
With yModem the FIT Image is only supplied once, so we can only
seek forward in the yModem supplied image and never backwards.
With the recent changes to the SPL mechanism, including loading
U-Boot first, FDT after, then the loadables, we must also reorder
the FIT image script to make sure that the loadables are last in
the FIT image.
Signed-off-by: Patrick Wildt <pa...@bl...>
Tested-by: Sébastien Szymanski <seb...@ar...>
commit f3e1c536a9d9b9940f02d0b4f24eb818e31398dc
Author: Peng Fan <pen...@nx...>
Date: Tue May 5 20:18:02 2020 +0800
imx: Kconfig: enable IMX_BOOTAUX for i.MX8M
i.MX8M could use imx bootaux to boot m4/m7 core, so let's add it
to the dependency list.
Signed-off-by: Peng Fan <pen...@nx...>
commit 8fde50f702b92895f0a1ae5fa307199ab4ff0dbe
Author: Giulio Benetti <giu...@be...>
Date: Tue Apr 28 18:20:11 2020 +0200
ARM: dts: imxrt1050: indent lcdif node correctly
Accidentally submitted a patch with indentation not correct, let's fix it
by indenting wrong lines.
Signed-off-by: Giulio Benetti <giu...@be...>
Acked-by: Peng Fan <pen...@nx...>
-----------------------------------------------------------------------
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-06-15 14:36: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 691e0c66745b416aff2eec68e7c8d436aabb77dd (commit)
via ac52dd9ad6335463c0aa772d3cddf6d4183b84dd (commit)
from a926359c1f8ec90e46eead92ca1cced374eb8818 (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 691e0c66745b416aff2eec68e7c8d436aabb77dd
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 15 16:35:36 2020 +0200
[BUILDROOT] 2020.02: imx-usb-loader: bump version to support i.MX8M Nano
commit ac52dd9ad6335463c0aa772d3cddf6d4183b84dd
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 15 15:43:05 2020 +0200
[BUILDROOT] 2020.02: firmware-imx: i.MX8M SDMA/EASRC firmware, version bump
-----------------------------------------------------------------------
Summary of changes:
...escale-imx-firmware-imx-install-sdma-firm.patch | 64 ++++++++++++++++++++++
...escale-imx-firmware-imx-install-easrc-fir.patch | 35 ++++++++++++
...escale-imx-firmware-imx-bump-version-to-8.patch | 46 ++++++++++++++++
...71-imx-usb-loader-bump-version-to-30b43d6.patch | 63 +++++++++++++++++++++
patches/buildroot/2020.02/cleanup_buildroot.sh | 2 +
5 files changed, 210 insertions(+)
create mode 100644 patches/buildroot/2020.02/368-package-freescale-imx-firmware-imx-install-sdma-firm.patch
create mode 100644 patches/buildroot/2020.02/369-package-freescale-imx-firmware-imx-install-easrc-fir.patch
create mode 100644 patches/buildroot/2020.02/370-package-freescale-imx-firmware-imx-bump-version-to-8.patch
create mode 100644 patches/buildroot/2020.02/371-imx-usb-loader-bump-version-to-30b43d6.patch
diff --git a/patches/buildroot/2020.02/368-package-freescale-imx-firmware-imx-install-sdma-firm.patch b/patches/buildroot/2020.02/368-package-freescale-imx-firmware-imx-install-sdma-firm.patch
new file mode 100644
index 000000000..66ef1770d
--- /dev/null
+++ b/patches/buildroot/2020.02/368-package-freescale-imx-firmware-imx-install-sdma-firm.patch
@@ -0,0 +1,64 @@
+From fcb7e60514cdc420ce1983b9e1a39c79a0e5da97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 15 Jun 2020 13:46:05 +0200
+Subject: [PATCH 1/3] package/freescale-imx/firmware-imx: install sdma firmware
+ for i.MX8M{,M,N}
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+i.MX8M, i.MX8MM and i.MX8MN have sdma controllers so install sdma
+firmware for these SoCs. Mainline and NXP kernels expect the sdma
+firmware to be in /lib/firmware/imx/sdma so fix the install path at the
+same time.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../freescale-imx/firmware-imx/firmware-imx.mk | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 9fd1c54b48..725f275948 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -12,7 +12,7 @@ FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement
+ FIRMWARE_IMX_LICENSE_FILES = EULA COPYING
+ FIRMWARE_IMX_REDISTRIBUTE = NO
+
+-FIRMWARE_IMX_BLOBS = sdma vpu
++FIRMWARE_IMX_BLOBS = sdma epdc
+
+ define FIRMWARE_IMX_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
+@@ -84,23 +84,16 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ $(FIRMWARE_IMX_PREPARE_DDR_FW)
+ $(FIRMWARE_IMX_PREPARE_HDMI_FW)
+ endef
+-else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
+-define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+- $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \
+- $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin
+- $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \
+- $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin
+-endef
+-else
++endif
++
+ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/lib/firmware/imx
++ cp -r $(@D)/firmware/vpu $(TARGET_DIR)/lib/firmware
+ for blobdir in $(FIRMWARE_IMX_BLOBS); do \
+- cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \
++ cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware/imx; \
+ done
+- cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx
+ mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \
+ $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
+ endef
+-endif
+
+ $(eval $(generic-package))
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/369-package-freescale-imx-firmware-imx-install-easrc-fir.patch b/patches/buildroot/2020.02/369-package-freescale-imx-firmware-imx-install-easrc-fir.patch
new file mode 100644
index 000000000..c581106dd
--- /dev/null
+++ b/patches/buildroot/2020.02/369-package-freescale-imx-firmware-imx-install-easrc-fir.patch
@@ -0,0 +1,35 @@
+From b71dbbd91e5ba45b45becb2e1795531a9c641dca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 15 Jun 2020 14:58:04 +0200
+Subject: [PATCH 2/3] package/freescale-imx/firmware-imx: install easrc
+ firmware for i.MX8MN
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On i.MX8MN, the easrc driver needs a firmware in /lib/firmwareimx/easrc/
+so install it.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/freescale-imx/firmware-imx/firmware-imx.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 725f275948..49fda89f28 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -13,6 +13,9 @@ FIRMWARE_IMX_LICENSE_FILES = EULA COPYING
+ FIRMWARE_IMX_REDISTRIBUTE = NO
+
+ FIRMWARE_IMX_BLOBS = sdma epdc
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y)
++FIRMWARE_IMX_BLOBS += easrc
++endif
+
+ define FIRMWARE_IMX_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/370-package-freescale-imx-firmware-imx-bump-version-to-8.patch b/patches/buildroot/2020.02/370-package-freescale-imx-firmware-imx-bump-version-to-8.patch
new file mode 100644
index 000000000..1225cce89
--- /dev/null
+++ b/patches/buildroot/2020.02/370-package-freescale-imx-firmware-imx-bump-version-to-8.patch
@@ -0,0 +1,46 @@
+From 9010f9a0e9150463c2a7d17bcb0ad3985f9b3c1e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 15 Jun 2020 14:26:01 +0200
+Subject: [PATCH 3/3] package/freescale-imx/firmware-imx: bump version to 8.6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This package needed to be updated to be aligned with NXP
+BSP 5.4.3_1.0.0.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++---
+ package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash
+index e49ce085bf..54a3dafcc0 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.hash
++++ b/package/freescale-imx/firmware-imx/firmware-imx.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated
+-sha256 45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d firmware-imx-8.5.bin
+-sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
+-sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
++sha256 a7f4a22c05a990aad43a616e312847ab9d85ce00691b34fa8590d5c7c1d722e9 firmware-imx-8.6.bin
++sha256 1360edf65a32b66d28bcf2d53a1a1c2dc88d4e254c15da3d8e37bf1b6f1f19a1 EULA
++sha256 30ba26ae82fba4033513b67c2c3a00b00e78908d278568a7d648d3430875123a COPYING
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 49fda89f28..f27afc5a3b 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-FIRMWARE_IMX_VERSION = 8.5
++FIRMWARE_IMX_VERSION = 8.6
+ FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
+ FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
+
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/371-imx-usb-loader-bump-version-to-30b43d6.patch b/patches/buildroot/2020.02/371-imx-usb-loader-bump-version-to-30b43d6.patch
new file mode 100644
index 000000000..f1c180ac7
--- /dev/null
+++ b/patches/buildroot/2020.02/371-imx-usb-loader-bump-version-to-30b43d6.patch
@@ -0,0 +1,63 @@
+From 5eaf4457cc4c6d27ce42ef3e83108feacce0e91e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 15 Jun 2020 15:32:23 +0200
+Subject: [PATCH 1/1] imx-usb-loader: bump version to 30b43d6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bump version to get i.MX8M Nano support.
+
+Changes sinces 4aa9809:
+
+ 30b43d6 (HEAD -> master, origin/master, origin/HEAD) Fix MinGW Build (#114)
+ 25d6c0d mx8m_usb_sdp_spl: create generic sdp spl config for all imx8m
+ dc0fb26 mx8mn_usb_sdp_spl.conf: initial addition
+ f009770 imx_sdp: don't try to load hdmi firmware
+ c5c4d28 add SPDS protocol support, imx8mn(nano)
+ 15dbbd7 tests: add pid 0x1001
+ 353791c tests: add pids 0x0134/0x1000
+ 06fb581 tests: pid=0x0080 is for mx6ull
+ 6b07a0a mx8mm_usb_sdp_spl.conf/ mx8mm_usb_work.conf: s/imx-mkimage/u-boot-imx6/
+ b00b0e2 mx8mq_usb_work.conf: load flash.bin from u-boot-imx6 directory
+ bda7ab6 add mx8mq_usb_sdp_spl.conf
+ 7984efc Moving libusb_free_device_list to get imx_usb to work on Windows.
+ 29fa8ab imx_usb: use device found by find_imx_device
+ abe7f5d add support for relocatable installs
+ 3d36c83 Fixed build for Visual Studio 2015 Express.
+ fe50624 imx_usb.config: add mx8mm_usb_sdp_spl.conf/mx8mm_usb_work.conf lines
+ f7752f4 mx8mq_usb_work.conf: use bl31-iMX8MQ-2g.bin to match branch boundary-imx_4.9.123_imx8mm_ga of imx-mkimage
+ 8c9eee7 add mx8mm config files
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/imx-usb-loader/imx-usb-loader.hash | 2 +-
+ package/imx-usb-loader/imx-usb-loader.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash
+index 182116a25f..7e1c097143 100644
+--- a/package/imx-usb-loader/imx-usb-loader.hash
++++ b/package/imx-usb-loader/imx-usb-loader.hash
+@@ -1,3 +1,3 @@
+ # locally computed
+-sha256 5a17886042c09f0f16093031183a287a2a7ae0fa9cd8bdfa31e7b31cb92510d9 imx-usb-loader-4aa9809099dcece9a9225776321f3b4b5b896d78.tar.gz
++sha256 4357907c9669874d3ccbf00395bf0b1733c26e6daea85d721f1c0cd897f4162c imx-usb-loader-30b43d69770cd69e84c045dc9dcabb1f3e9d975a.tar.gz
+ sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
+diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk
+index 594bbb9ca1..1a09486928 100644
+--- a/package/imx-usb-loader/imx-usb-loader.mk
++++ b/package/imx-usb-loader/imx-usb-loader.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-IMX_USB_LOADER_VERSION = 4aa9809099dcece9a9225776321f3b4b5b896d78
++IMX_USB_LOADER_VERSION = 30b43d69770cd69e84c045dc9dcabb1f3e9d975a
+
+ IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION))
+ IMX_USB_LOADER_LICENSE = LGPL-2.1+
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index ac15a81cc..da992b358 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -76,6 +76,8 @@ rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.p
rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.hash
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-11 13:25:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a926359c1f8ec90e46eead92ca1cced374eb8818 (commit)
from e2f4ddcfbb5cd43f5da2257cc7d10df88a4758da (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 a926359c1f8ec90e46eead92ca1cced374eb8818
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 15:23:41 2020 +0200
[BUILDROOT] disable Armadeus U-Boot post install images hook for i.MX8M
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 64fd17e41..940a33458 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -13,6 +13,8 @@ LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
ifneq ($(BR2_CPU_NAME), "imx6")
ifneq ($(BR2_CPU_NAME), "imx6ul")
+ifneq ($(BR2_CPU_NAME), "imx8mm")
+ifneq ($(BR2_CPU_NAME), "imx8mn")
define UBOOT_UPDATE_CONFIG_HEADER
$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
@@ -47,6 +49,8 @@ define UBOOT_POST_INSTALL_IMAGES_ACTION
endef
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
+endif # BR2_CPU_NAME != imx8mn
+endif # BR2_CPU_NAME != imx8mm
endif # BR2_CPU_NAME != imx6ul
endif # BR2_CPU_NAME != imx6
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-11 09:50: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 "UNNAMED PROJECT".
The branch, armadeus-2020.07-rc4 has been updated
via fa121849994b9099f437b4f7960239fc9b38d3de (commit)
via ccf9a7dc509b469bdc324001d0c9ffcabef60453 (commit)
from 24dbee730babde67c5f82967dae144b122ce6947 (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 fa121849994b9099f437b4f7960239fc9b38d3de
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:37:46 2020 +0200
imx: imx8m: allow passing DDR/HDMI firmware file paths
commit ccf9a7dc509b469bdc324001d0c9ffcabef60453
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jun 11 11:36:42 2020 +0200
imx: imx8m: build SPL file
-----------------------------------------------------------------------
Summary of changes:
arch/arm/mach-imx/Makefile | 22 +++++++++++++++-------
tools/imx8m_image.sh | 34 +++++++++++++++++++++-------------
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a70d51b5cf..1759cb47ba 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -108,7 +108,7 @@ DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctre
else ifeq ($(CONFIG_ARCH_IMX8M), y)
IMAGE_TYPE := imx8mimage
IMX8M_DEPFILES := $(srctree)/tools/imx8m_image.sh
-DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG);if [ -f spl/u-boot-spl.cfgout ]; then $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 0; echo $$?; fi)
+DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o spl/u-boot-spl.cfgout $(srctree)/$(IMX_CONFIG);if [ -f spl/u-boot-spl.cfgout ]; then $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 0 $(IMX_DDR_FW_PATH) $(IMX_HDMI_FW_PATH); echo $$?; fi)
else
IMAGE_TYPE := imximage
DEPFILE_EXISTS := 0
@@ -143,17 +143,25 @@ endif
ifdef CONFIG_ARM64
ifeq ($(CONFIG_ARCH_IMX8M), y)
-SPL:
+spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE
+ifeq ($(DEPFILE_EXISTS),0)
+ $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 1 $(IMX_DDR_FW_PATH) $(IMX_HDMI_FW_PATH)
+endif
+
+spl/u-boot-spl-spl-only.cfgout: spl/u-boot-spl.cfgout
+ $(Q)sed '/^SECOND_LOADER/d' $< > $@
+
+MKIMAGEFLAGS_SPL = -n spl/u-boot-spl-spl-only.cfgout \
+ -T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)
+SPL: MKIMAGEOUTPUT = SPL.log
+
+SPL: spl/u-boot-spl-ddr.bin spl/u-boot-spl-spl-only.cfgout FORCE
+ $(call if_changed,mkimage)
MKIMAGEFLAGS_flash.bin = -n spl/u-boot-spl.cfgout \
-T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)
flash.bin: MKIMAGEOUTPUT = flash.log
-spl/u-boot-spl-ddr.bin: spl/u-boot-spl.bin spl/u-boot-spl.cfgout FORCE
-ifeq ($(DEPFILE_EXISTS),0)
- $(IMX8M_DEPFILES) spl/u-boot-spl.cfgout 1
-endif
-
flash.bin: spl/u-boot-spl-ddr.bin u-boot.itb FORCE
$(call if_changed,mkimage)
endif
diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh
index ba60104443..fef8814ddf 100755
--- a/tools/imx8m_image.sh
+++ b/tools/imx8m_image.sh
@@ -8,35 +8,43 @@ file=$1
post_process=$2
+ddr_fw_path=$3
+
+hdmi_fw_path=$4
+
blobs=`awk '/^SIGNED_HDMI/ {print $2} /^LOADER/ {print $2} /^SECOND_LOADER/ {print $2} /^DDR_FW/ {print $2}' $file`
for f in $blobs; do
if [ $f = "spl/u-boot-spl-ddr.bin" ] || [ $f = "u-boot.itb" ]; then
continue
fi
- if [ ! -f $f ]; then
- echo "WARNING '$f' not found, resulting binary is not-functional" >&2
+ if [ $f = "signed_hdmi_imx8m.bin" ] && [ -! ${hdmi_fw_path}$f ]; then
+ echo "WARNING '${hdmi_fw_path}$f' not found, resulting binary is not-functional" >&2
+ exit 1
+ fi
+
+ if [ ! -f ${ddr_fw_path}$f ]; then
+ echo "WARNING '${ddr_fw_path}$f' not found, resulting binary is not-functional" >&2
exit 1
fi
done
if [ $post_process = 1 ]; then
- if [ -f lpddr4_pmu_train_1d_imem.bin ]; then
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
- objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin
+ if grep -q 'lpddr4_' <<< $blobs; then
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
+ objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin
cat lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin > lpddr4_pmu_train_1d_fw.bin
- cat lpddr4_pmu_train_2d_imem_pad.bin lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin
+ cat lpddr4_pmu_train_2d_imem_pad.bin ${ddr_fw_path}lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin
dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync
cat spl/u-boot-spl-pad.bin lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin > spl/u-boot-spl-ddr.bin
rm -f lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin lpddr4_pmu_train_2d_imem_pad.bin spl/u-boot-spl-pad.bin
- fi
- if [ -f ddr4_imem_1d.bin ]; then
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_1d.bin ddr4_imem_1d_pad.bin
- objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin
- objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_2d.bin ddr4_imem_2d_pad.bin
+ else
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}ddr4_imem_1d.bin ddr4_imem_1d_pad.bin
+ objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ${ddr_fw_path}ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin
+ objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ${ddr_fw_path}ddr4_imem_2d.bin ddr4_imem_2d_pad.bin
cat ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin > ddr4_1d_fw.bin
- cat ddr4_imem_2d_pad.bin ddr4_dmem_2d.bin > ddr4_2d_fw.bin
+ cat ddr4_imem_2d_pad.bin ${ddr_fw_path}ddr4_dmem_2d.bin > ddr4_2d_fw.bin
dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync
cat spl/u-boot-spl-pad.bin ddr4_1d_fw.bin ddr4_2d_fw.bin > spl/u-boot-spl-ddr.bin
rm -f ddr4_1d_fw.bin ddr4_2d_fw.bin ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin ddr4_imem_2d_pad.bin spl/u-boot-spl-pad.bin
hooks/post-receive
--
UNNAMED PROJECT
|
|
From: Sébastien S. <ss...@us...> - 2020-06-09 13:50:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e2f4ddcfbb5cd43f5da2257cc7d10df88a4758da (commit)
from f48208fdd76b1a3346f212e3a6fc9bf923be69de (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 e2f4ddcfbb5cd43f5da2257cc7d10df88a4758da
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 9 15:48:24 2020 +0200
[BUILDROOT] 2020.02: imx-mkimage: fix patch 366 (no renames)
-----------------------------------------------------------------------
Summary of changes:
...-mkimage-bump-to-version-rel_imx_4.19.35_.patch | 275 ++++++++++++++-------
1 file changed, 180 insertions(+), 95 deletions(-)
diff --git a/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch b/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
index f0ee90ff2..02a78959e 100644
--- a/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
+++ b/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
@@ -12,128 +12,213 @@ Signed-off-by: Maeva Manuel <mae...@os...>
Signed-off-by: Julien Olivain <jul...@os...>
Signed-off-by: Thomas Petazzoni <tho...@bo...>
---
- ...verriding-BL32-and-BL33-not-only-BL.patch} | 26 ++++++++++---------
- ...ch => 0002-Add-LDFLAGS-to-link-step.patch} | 14 +++++-----
- .../0003-Add-unused-fake-version.patch | 9 ++++---
+ ...overriding-BL32-and-BL33-not-only-BL.patch | 60 +++++++++++++++++++
+ ...overriding-bl32-and-bl33-not-only-bl.patch | 58 ------------------
+ .../0002-Add-LDFLAGS-to-link-step.patch | 26 ++++++++
+ .../0002-add-ldflags-to-link-step.patch | 26 --------
+ .../0003-Add-unused-fake-version.patch | 9 ++-
package/imx-mkimage/imx-mkimage.hash | 2 +-
package/imx-mkimage/imx-mkimage.mk | 2 +-
- 5 files changed, 29 insertions(+), 24 deletions(-)
- rename package/imx-mkimage/{0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch => 0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch} (70%)
- rename package/imx-mkimage/{0002-add-ldflags-to-link-step.patch => 0002-Add-LDFLAGS-to-link-step.patch} (52%)
+ 7 files changed, 94 insertions(+), 89 deletions(-)
+ create mode 100644 package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+ delete mode 100644 package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
+ create mode 100644 package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+ delete mode 100644 package/imx-mkimage/0002-add-ldflags-to-link-step.patch
-diff --git a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
-similarity index 70%
-rename from package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
-rename to package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
-index 430122f7ed..e8ba820f2f 100644
---- a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
+diff --git a/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+new file mode 100644
+index 0000000000..e8ba820f2f
+--- /dev/null
+++ b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
-@@ -1,4 +1,4 @@
--From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001
+@@ -0,0 +1,60 @@
+From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001
- From: Erik Larsson <eri...@co...>
- Date: Thu, 8 Mar 2018 19:04:37 +0100
- Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
-@@ -7,14 +7,14 @@ Signed-off-by: Erik Larsson <kar...@gm...>
- Signed-off-by: Christopher Dahlberg <cri...@gm...>
- Signed-off-by: Marcus Folkesson <mar...@gm...>
- ---
-- iMX8M/mkimage_fit_atf.sh | 18 +++++++++---------
-- 1 file changed, 9 insertions(+), 9 deletions(-)
++From: Erik Larsson <eri...@co...>
++Date: Thu, 8 Mar 2018 19:04:37 +0100
++Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
++
++Signed-off-by: Erik Larsson <kar...@gm...>
++Signed-off-by: Christopher Dahlberg <cri...@gm...>
++Signed-off-by: Marcus Folkesson <mar...@gm...>
++---
+ iMX8M/mkimage_fit_atf.sh | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
-
- diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
--index 3a3bd10..727f746 100755
++
++diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
+index 95749b1..c1aa902 100755
- --- a/iMX8M/mkimage_fit_atf.sh
- +++ b/iMX8M/mkimage_fit_atf.sh
--@@ -11,29 +11,29 @@ if [ ! -f $BL31 ]; then
++--- a/iMX8M/mkimage_fit_atf.sh
+++++ b/iMX8M/mkimage_fit_atf.sh
+@@ -18,23 +18,23 @@ if [ ! -f $BL31 ]; then
- echo "ERROR: BL31 file $BL31 NOT found" >&2
- exit 0
- else
-@@ -26,33 +26,35 @@ index 3a3bd10..727f746 100755
-
- -BL32="tee.bin"
- +[ -z "$BL32" ] && BL32="tee.bin"
++ echo "ERROR: BL31 file $BL31 NOT found" >&2
++ exit 0
++ else
++- echo "bl31.bin size: " >&2
++- ls -lct bl31.bin | awk '{print $5}' >&2
+++ echo "$BL31 size: " >&2
+++ ls -lct $BL31 | awk '{print $5}' >&2
++ fi
++
++-BL32="tee.bin"
+++[ -z "$BL32" ] && BL32="tee.bin"
+ LOADABLES="\"atf@1\""
-
- if [ ! -f $BL32 ]; then
- BL32=/dev/null
- else
--- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
++
++ if [ ! -f $BL32 ]; then
++ BL32=/dev/null
++ else
+ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
- - echo "tee.bin size: " >&2
- - ls -lct tee.bin | awk '{print $5}' >&2
--+ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete $BL32" >&2
- + echo "$BL32 size: " >&2
- + ls -lct $BL32 | awk '{print $5}' >&2
++- echo "tee.bin size: " >&2
++- ls -lct tee.bin | awk '{print $5}' >&2
+++ echo "$BL32 size: " >&2
+++ ls -lct $BL32 | awk '{print $5}' >&2
+ LOADABLES="$LOADABLES, \"tee@1\""
- fi
-
- -BL33="u-boot-nodtb.bin"
- +[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
++ fi
++
++-BL33="u-boot-nodtb.bin"
+++[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
+ DEK_BLOB="dek_blob_fit_dummy.bin"
-
-- if [ ! -f $BL33 ]; then
-- echo "ERROR: $BL33 file NOT found" >&2
++
+ if [ ! -f $DEK_BLOB ]; then
+@@ -49,8 +49,8 @@ if [ ! -f $BL33 ]; then
- exit 0
- else
--
++ exit 0
++ else
+
- - echo "u-boot-nodtb.bin size: " >&2
- - ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
--+ echo "$BL33: " >&2
++- echo "u-boot-nodtb.bin size: " >&2
++- ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
++ echo "$BL33 size: " >&2
- + ls -lct $BL33 | awk '{print $5}' >&2
- fi
-
- for dtname in $*
- --
+++ ls -lct $BL33 | awk '{print $5}' >&2
++ fi
++
++ for dtname in $*
++--
++2.25.1
++
+diff --git a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
+deleted file mode 100644
+index 430122f7ed..0000000000
+--- a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
++++ /dev/null
+@@ -1,58 +0,0 @@
+-From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001
+-From: Erik Larsson <eri...@co...>
+-Date: Thu, 8 Mar 2018 19:04:37 +0100
+-Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
+-
+-Signed-off-by: Erik Larsson <kar...@gm...>
+-Signed-off-by: Christopher Dahlberg <cri...@gm...>
+-Signed-off-by: Marcus Folkesson <mar...@gm...>
+----
+- iMX8M/mkimage_fit_atf.sh | 18 +++++++++---------
+- 1 file changed, 9 insertions(+), 9 deletions(-)
+-
+-diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
+-index 3a3bd10..727f746 100755
+---- a/iMX8M/mkimage_fit_atf.sh
+-+++ b/iMX8M/mkimage_fit_atf.sh
+-@@ -11,29 +11,29 @@ if [ ! -f $BL31 ]; then
+- echo "ERROR: BL31 file $BL31 NOT found" >&2
+- exit 0
+- else
+-- echo "bl31.bin size: " >&2
+-- ls -lct bl31.bin | awk '{print $5}' >&2
+-+ echo "$BL31 size: " >&2
+-+ ls -lct $BL31 | awk '{print $5}' >&2
+- fi
+-
+--BL32="tee.bin"
+-+[ -z "$BL32" ] && BL32="tee.bin"
+-
+- if [ ! -f $BL32 ]; then
+- BL32=/dev/null
+- else
+-- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
+-- echo "tee.bin size: " >&2
+-- ls -lct tee.bin | awk '{print $5}' >&2
+-+ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete $BL32" >&2
+-+ echo "$BL32 size: " >&2
+-+ ls -lct $BL32 | awk '{print $5}' >&2
+- fi
+-
+--BL33="u-boot-nodtb.bin"
+-+[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
+-
+- if [ ! -f $BL33 ]; then
+- echo "ERROR: $BL33 file NOT found" >&2
+- exit 0
+- else
+-
+-- echo "u-boot-nodtb.bin size: " >&2
+-- ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
+-+ echo "$BL33: " >&2
+-+ ls -lct $BL33 | awk '{print $5}' >&2
+- fi
+-
+- for dtname in $*
+---
-2.7.4
+-
+diff --git a/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+new file mode 100644
+index 0000000000..7272c3ac6c
+--- /dev/null
++++ b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+@@ -0,0 +1,26 @@
++From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001
++From: Erik Larsson <eri...@co...>
++Date: Tue, 6 Mar 2018 12:28:39 +0100
++Subject: [PATCH] Add LDFLAGS to link step
++
++Signed-off-by: Erik Larsson <kar...@gm...>
++---
++ iMX8M/soc.mak | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
++index d714259..aecf84b 100644
++--- a/iMX8M/soc.mak
+++++ b/iMX8M/soc.mak
++@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT)
++ $(MKIMG): mkimage_imx8.c
++ @echo "PLAT="$(PLAT) "HDMI="$(HDMI)
++ @echo "Compiling mkimage_imx8"
++- $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz
+++ $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz
++
++ u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin
++ @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
++--
+2.25.1
-
-diff --git a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
-similarity index 52%
-rename from package/imx-mkimage/0002-add-ldflags-to-link-step.patch
-rename to package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
-index 1d5fe77596..7272c3ac6c 100644
++
+diff --git a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
+deleted file mode 100644
+index 1d5fe77596..0000000000
--- a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
-+++ b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
-@@ -1,4 +1,4 @@
++++ /dev/null
+@@ -1,26 +0,0 @@
-From a73f20fbe921c7ecff3efda23bc506fdd935ee4d Mon Sep 17 00:00:00 2001
-+From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001
- From: Erik Larsson <eri...@co...>
- Date: Tue, 6 Mar 2018 12:28:39 +0100
- Subject: [PATCH] Add LDFLAGS to link step
-@@ -9,18 +9,18 @@ Signed-off-by: Erik Larsson <kar...@gm...>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
+-From: Erik Larsson <eri...@co...>
+-Date: Tue, 6 Mar 2018 12:28:39 +0100
+-Subject: [PATCH] Add LDFLAGS to link step
+-
+-Signed-off-by: Erik Larsson <kar...@gm...>
+----
+- iMX8M/soc.mak | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
-index 8346769..38a14bb 100644
-+index d714259..aecf84b 100644
- --- a/iMX8M/soc.mak
- +++ b/iMX8M/soc.mak
+---- a/iMX8M/soc.mak
+-+++ b/iMX8M/soc.mak
-@@ -15,7 +15,7 @@ FW_DIR = imx-boot/imx-boot-tools/imx8mq
-
-+@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT)
- $(MKIMG): mkimage_imx8.c
-+ @echo "PLAT="$(PLAT) "HDMI="$(HDMI)
- @echo "Compiling mkimage_imx8"
- - $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz
- + $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz
-
+- $(MKIMG): mkimage_imx8.c
+- @echo "Compiling mkimage_imx8"
+-- $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz
+-+ $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz
+-
- $(DCD_CFG): $(DCD_CFG_SRC)
- @echo "Converting iMX8M DCD file"
-+ u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin
-+ @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
- --
+---
-2.7.4
-+2.25.1
-
+-
diff --git a/package/imx-mkimage/0003-Add-unused-fake-version.patch b/package/imx-mkimage/0003-Add-unused-fake-version.patch
index 9652a817ba..0e817a1ac8 100644
--- a/package/imx-mkimage/0003-Add-unused-fake-version.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-09 13:36: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 f48208fdd76b1a3346f212e3a6fc9bf923be69de (commit)
from 244080675e0d6696ac9b30db85b3c74564d8d72d (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 f48208fdd76b1a3346f212e3a6fc9bf923be69de
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jun 9 15:36:20 2020 +0200
[BUILDROOT] imx-mkimage: backport patches to support i.MX8M Nano
-----------------------------------------------------------------------
Summary of changes:
...-mkimage-bump-to-version-rel_imx_4.19.35_.patch | 193 +++++++++++++++++++++
...7-imx-mkimage-add-support-for-i.MX8M-Nano.patch | 30 ++++
patches/buildroot/2020.02/cleanup_buildroot.sh | 7 +
3 files changed, 230 insertions(+)
create mode 100644 patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
create mode 100644 patches/buildroot/2020.02/367-imx-mkimage-add-support-for-i.MX8M-Nano.patch
diff --git a/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch b/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
new file mode 100644
index 000000000..f0ee90ff2
--- /dev/null
+++ b/patches/buildroot/2020.02/366-package-imx-mkimage-bump-to-version-rel_imx_4.19.35_.patch
@@ -0,0 +1,193 @@
+From 22d0a66f80af7271d5dd682733e72fbc03677fb7 Mon Sep 17 00:00:00 2001
+From: Maeva Manuel <mae...@os...>
+Date: Fri, 20 Mar 2020 17:31:57 +0100
+Subject: [PATCH 1/2] package/imx-mkimage: bump to version
+ rel_imx_4.19.35_1.1.0
+
+This package needed to be updated to be aligned with NXP BSP
+4.19.35_1.1.0
+The package patches have also been rebased on top of rel_imx_4.19.35_1.1.0
+
+Signed-off-by: Maeva Manuel <mae...@os...>
+Signed-off-by: Julien Olivain <jul...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...verriding-BL32-and-BL33-not-only-BL.patch} | 26 ++++++++++---------
+ ...ch => 0002-Add-LDFLAGS-to-link-step.patch} | 14 +++++-----
+ .../0003-Add-unused-fake-version.patch | 9 ++++---
+ package/imx-mkimage/imx-mkimage.hash | 2 +-
+ package/imx-mkimage/imx-mkimage.mk | 2 +-
+ 5 files changed, 29 insertions(+), 24 deletions(-)
+ rename package/imx-mkimage/{0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch => 0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch} (70%)
+ rename package/imx-mkimage/{0002-add-ldflags-to-link-step.patch => 0002-Add-LDFLAGS-to-link-step.patch} (52%)
+
+diff --git a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+similarity index 70%
+rename from package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
+rename to package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+index 430122f7ed..e8ba820f2f 100644
+--- a/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
++++ b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+@@ -1,4 +1,4 @@
+-From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001
++From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001
+ From: Erik Larsson <eri...@co...>
+ Date: Thu, 8 Mar 2018 19:04:37 +0100
+ Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
+@@ -7,14 +7,14 @@ Signed-off-by: Erik Larsson <kar...@gm...>
+ Signed-off-by: Christopher Dahlberg <cri...@gm...>
+ Signed-off-by: Marcus Folkesson <mar...@gm...>
+ ---
+- iMX8M/mkimage_fit_atf.sh | 18 +++++++++---------
+- 1 file changed, 9 insertions(+), 9 deletions(-)
++ iMX8M/mkimage_fit_atf.sh | 16 ++++++++--------
++ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+ diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
+-index 3a3bd10..727f746 100755
++index 95749b1..c1aa902 100755
+ --- a/iMX8M/mkimage_fit_atf.sh
+ +++ b/iMX8M/mkimage_fit_atf.sh
+-@@ -11,29 +11,29 @@ if [ ! -f $BL31 ]; then
++@@ -18,23 +18,23 @@ if [ ! -f $BL31 ]; then
+ echo "ERROR: BL31 file $BL31 NOT found" >&2
+ exit 0
+ else
+@@ -26,33 +26,35 @@ index 3a3bd10..727f746 100755
+
+ -BL32="tee.bin"
+ +[ -z "$BL32" ] && BL32="tee.bin"
++ LOADABLES="\"atf@1\""
+
+ if [ ! -f $BL32 ]; then
+ BL32=/dev/null
+ else
+-- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
++ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
+ - echo "tee.bin size: " >&2
+ - ls -lct tee.bin | awk '{print $5}' >&2
+-+ echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete $BL32" >&2
+ + echo "$BL32 size: " >&2
+ + ls -lct $BL32 | awk '{print $5}' >&2
++ LOADABLES="$LOADABLES, \"tee@1\""
+ fi
+
+ -BL33="u-boot-nodtb.bin"
+ +[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
++ DEK_BLOB="dek_blob_fit_dummy.bin"
+
+- if [ ! -f $BL33 ]; then
+- echo "ERROR: $BL33 file NOT found" >&2
++ if [ ! -f $DEK_BLOB ]; then
++@@ -49,8 +49,8 @@ if [ ! -f $BL33 ]; then
+ exit 0
+ else
+-
++
+ - echo "u-boot-nodtb.bin size: " >&2
+ - ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
+-+ echo "$BL33: " >&2
+++ echo "$BL33 size: " >&2
+ + ls -lct $BL33 | awk '{print $5}' >&2
+ fi
+
+ for dtname in $*
+ --
+-2.7.4
++2.25.1
+
+diff --git a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+similarity index 52%
+rename from package/imx-mkimage/0002-add-ldflags-to-link-step.patch
+rename to package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+index 1d5fe77596..7272c3ac6c 100644
+--- a/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
++++ b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+@@ -1,4 +1,4 @@
+-From a73f20fbe921c7ecff3efda23bc506fdd935ee4d Mon Sep 17 00:00:00 2001
++From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001
+ From: Erik Larsson <eri...@co...>
+ Date: Tue, 6 Mar 2018 12:28:39 +0100
+ Subject: [PATCH] Add LDFLAGS to link step
+@@ -9,18 +9,18 @@ Signed-off-by: Erik Larsson <kar...@gm...>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+ diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
+-index 8346769..38a14bb 100644
++index d714259..aecf84b 100644
+ --- a/iMX8M/soc.mak
+ +++ b/iMX8M/soc.mak
+-@@ -15,7 +15,7 @@ FW_DIR = imx-boot/imx-boot-tools/imx8mq
+-
++@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT)
+ $(MKIMG): mkimage_imx8.c
++ @echo "PLAT="$(PLAT) "HDMI="$(HDMI)
+ @echo "Compiling mkimage_imx8"
+ - $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz
+ + $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz
+
+- $(DCD_CFG): $(DCD_CFG_SRC)
+- @echo "Converting iMX8M DCD file"
++ u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin
++ @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
+ --
+-2.7.4
++2.25.1
+
+diff --git a/package/imx-mkimage/0003-Add-unused-fake-version.patch b/package/imx-mkimage/0003-Add-unused-fake-version.patch
+index 9652a817ba..0e817a1ac8 100644
+--- a/package/imx-mkimage/0003-Add-unused-fake-version.patch
++++ b/package/imx-mkimage/0003-Add-unused-fake-version.patch
+@@ -1,7 +1,10 @@
+-From e75feef80b51c9060e3702390040495312648ad2 Mon Sep 17 00:00:00 2001
++From b25b4324be4c0dd9ee5fecdf2981d291fb187686 Mon Sep 17 00:00:00 2001
+ From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <ne...@da...>
+ Date: Mon, 25 Feb 2019 22:15:55 +0100
+ Subject: [PATCH] Add unused fake version
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
+
+ The Makefile makes the assumption that the build process runs
+ from a Git clone of the source code.
+@@ -14,7 +17,7 @@ Signed-off-by: André Hentschel <ne...@da...>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+ diff --git a/Makefile b/Makefile
+-index ccf42e8..6041574 100644
++index 49ef486..b966399 100644
+ --- a/Makefile
+ +++ b/Makefile
+ @@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS)
+@@ -29,5 +32,5 @@ index ccf42e8..6041574 100644
+ help:
+ @echo $(CURR_DIR)
+ --
+-2.17.1
++2.25.1
+
+diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash
+index e75619b8d4..6d5a329ed5 100644
+--- a/package/imx-mkimage/imx-mkimage.hash
++++ b/package/imx-mkimage/imx-mkimage.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 ceeb297bb0aee02d7b105ee245d00f3cafd74fc73ef0c6182b058b234d5bbbd7 imx-mkimage-rel_imx_4.14.98_2.0.0_ga.tar.gz
++sha256 a7e4c1c45b0d36e088bd7891335aa3c726682750984b7ca072e3c6329def92cf imx-mkimage-rel_imx_4.19.35_1.1.0.tar.gz
+ sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
+diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk
+index a58ddf07b7..270ef2ee01 100644
+--- a/package/imx-mkimage/imx-mkimage.mk
++++ b/package/imx-mkimage/imx-mkimage.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-IMX_MKIMAGE_VERSION = rel_imx_4.14.98_2.0.0_ga
++IMX_MKIMAGE_VERSION = rel_imx_4.19.35_1.1.0
+ IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage
+ IMX_MKIMAGE_SITE_METHOD = git
+ IMX_MKIMAGE_LICENSE = GPL-2.0+
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/367-imx-mkimage-add-support-for-i.MX8M-Nano.patch b/patches/buildroot/2020.02/367-imx-mkimage-add-support-for-i.MX8M-Nano.patch
new file mode 100644
index 000000000..289185622
--- /dev/null
+++ b/patches/buildroot/2020.02/367-imx-mkimage-add-support-for-i.MX8M-Nano.patch
@@ -0,0 +1,30 @@
+From 7a0323c5dfcbce91010b3158d3488a1ade7bdec6 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Wed, 15 Apr 2020 18:18:27 +0200
+Subject: [PATCH 2/2] package/imx-mkimage: add support for i.MX8M Nano
+
+This CPU uses the same tools to generate boot images as 8MQ/8MMini.
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Cc: Erik Larsson <kar...@gm...
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/imx-mkimage/imx-mkimage.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk
+index 270ef2ee01..ed0e435a73 100644
+--- a/package/imx-mkimage/imx-mkimage.mk
++++ b/package/imx-mkimage/imx-mkimage.mk
+@@ -11,7 +11,7 @@ IMX_MKIMAGE_LICENSE = GPL-2.0+
+ IMX_MKIMAGE_LICENSE_FILES = COPYING
+ HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib
+
+-ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y)
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y)
+ # i.MX8M needs a different binary
+ define HOST_IMX_MKIMAGE_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index d93bfdcf8..ac15a81cc 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -64,6 +64,13 @@ rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+rm -rf buildroot/package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch
+rm -rf buildroot/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch
+rm -rf buildroot/package/imx-mkimage/0002-add-ldflags-to-link-step.patch
+rm -rf buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch
+rm -rf buildroot/package/imx-mkimage/imx-mkimage.hash
+rm -rf buildroot/package/imx-mkimage/imx-mkimage.mk
rm -rf buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2020-06-09 10:31:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 244080675e0d6696ac9b30db85b3c74564d8d72d (commit)
from 0cdb23f1daeb371685c408327b1e93a62b34a20c (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 244080675e0d6696ac9b30db85b3c74564d8d72d
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jun 9 12:30:46 2020 +0200
[BUILDROOT] 2019.02: fix gpsd python fix for python3
-----------------------------------------------------------------------
Summary of changes:
...eus-package-gpsd-fix-python-tools-build-and-install.patch | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index 125a9c2e1..ab09e339c 100644
--- a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -6,7 +6,7 @@ Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- buildroot.orig/package/gpsd/gpsd.mk 2020-01-10 18:11:07.923396474 +0100
+++ buildroot/package/gpsd/gpsd.mk 2020-01-10 23:01:18.320507779 +0100
-@@ -23,9 +23,16 @@
+@@ -23,9 +23,22 @@
prefix=/usr\
sysroot=$(STAGING_DIR)\
strip=no\
@@ -14,12 +14,18 @@ Index: buildroot/package/gpsd/gpsd.mk
qt=no
+ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python2.7"
++ifeq ($(BR2_PACKAGE_PYTHON),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)"
+GPSD_SCONS_OPTS += \
-+ python_libdir=/usr/lib/python2.7/
++ python_libdir=/usr/lib/python$(PYTHON_VERSION)/
++else ifeq ($(BR2_PACKAGE_PYTHON3),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m"
++GPSD_SCONS_OPTS += \
++ python_libdir=/usr/lib/python$(PYTHON3_VERSION)/
+else
+GPSD_SCONS_OPTS += python=no
+endif
++endif
+
ifeq ($(BR2_PACKAGE_NCURSES),y)
GPSD_DEPENDENCIES += ncurses
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-08 16:49:48
|
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 0cdb23f1daeb371685c408327b1e93a62b34a20c (commit)
from 43b8fbca7e7939e6ec5b0cf569b724af797128bd (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 0cdb23f1daeb371685c408327b1e93a62b34a20c
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jun 8 18:29:38 2020 +0200
[BUILDROOT] post-{build,image}.sh: add OPOS8M{Mini,Nano} support
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/rootfs/post_build.sh | 19 +++++++++++++++----
.../device/armadeus/rootfs/post_image_creation.sh | 10 +++++++---
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index f36a4b04c..48b244c87 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -2,6 +2,9 @@
#
# Create custom directories and links of Armadeus rootfs
#
+# arg1: BR target dir
+# arg2: board name
+# arg3: i.MX processor type
if [ ! -d "$1" ]; then
echo "Target directory ($1) not valid !"
@@ -21,24 +24,30 @@ symlink_image()
mkdir -p $1/boot
ln -sfn . $1/boot/dtbs # to keep compat with pre-6.0 APF6 U-Boots
symlink_image $1/boot uImage $2-linux.bin
-if [ "$3" != "imx6ul" ]; then
+if [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ]; then
symlink_image $1/boot zImage $2-linux.bin
else
if [ -f "$1/boot/zImage" ]; then
mv $1/boot/zImage $1/boot/$2-linux.bin
+ elif [ -f "$1/boot/Image" ]; then
+ mv $1/boot/Image $1/boot/$2-linux.bin
fi
fi
# !! Beware if using $2, because it can be changed for customers' BSP !!
if [ "$3" != "imxl" ]; then
- if [ "$3" != "imx6ul" ]; then
- echo "APF"${3//[!0-9]/} > $1/etc/machine
- else
+ if [ "$3" == "imx6ul" ]; then
if [ "$2" == "opos6ulnano" ]; then
echo "OPOS6ULNANO" > $1/etc/machine
else
echo "OPOS6UL" > $1/etc/machine
fi
+ elif [ "$3" == "imx8mm" ]; then
+ echo "OPOS8MMINI" > $1/etc/machine
+ elif [ "$3" == "imx8mn" ]; then
+ echo "OPOS8MNANO" > $1/etc/machine
+ else
+ echo "APF"${3//[!0-9]/} > $1/etc/machine
fi
else
echo "APF9328" > $1/etc/machine
@@ -58,7 +67,9 @@ if [ "$3" == "imx6ul" ]; then
rm -rf "$firmware"
fi
done
+fi
+if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ]; then
# Ask to mount HOME-DATA partition at each boot:
grep mmcblk0p3 $1/etc/fstab
if [ "$?" != "0" ]; then
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 3758ceb96..2dc0c496d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -35,14 +35,18 @@ if [ "$2" != "" ]; then
# linux
symlink_image $1 uImage $2-linux.bin
symlink_image $1 zImage $2-linux.bin
+ symlink_image $1 Image $2-linux.bin
symlink_image $1 $3-$2dev.dtb $2.dtb
# APF6
symlink_image $1 SPL $2-u-boot.spl
symlink_image $1 u-boot.img $2-u-boot.img
- # OPOS6ULNANO
+ # OPOS6UL / OPOS6ULNANO
symlink_image $1 u-boot-dtb.img $2-u-boot.img
+
+ # OPOS8M{Mini,Nano}
+ symlink_image $1 u-boot.itb $2-u-boot.itb
else
# Old BR compat
BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
@@ -51,8 +55,8 @@ else
fi
fi
-# if target uses ext4 for rootfs and is not an opos6ul,
-if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ]; then
+# if target uses ext4 for rootfs and is not an opos6ul or an opos8m{mini,nano}
+if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ]; then
# generate also boot.ext4:
rm -f $1/boot.ext4
$1/../host/sbin/mkfs.ext4 -L "BOOT" -r 1 -d $1/../target/boot/ $1/boot.ext4 "48M"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2020-06-08 15:38:28
|
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 43b8fbca7e7939e6ec5b0cf569b724af797128bd (commit)
from 4fac84f2e35ae652aeef446fab23eae27fde1360 (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 43b8fbca7e7939e6ec5b0cf569b724af797128bd
Author: Julien BOIBESSOT <jul...@ar...>
Date: Mon Jun 8 17:38:10 2020 +0200
[BUILDROOT] 2020.02: fix gpsd python fix for python3
-----------------------------------------------------------------------
Summary of changes:
...eus-package-gpsd-fix-python-tools-build-and-install.patch | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index fe5570166..f351414bf 100644
--- a/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -6,7 +6,7 @@ Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- buildroot.orig/package/gpsd/gpsd.mk
+++ buildroot/package/gpsd/gpsd.mk
-@@ -24,10 +24,17 @@ GPSD_SCONS_OPTS = \
+@@ -24,10 +24,23 @@ GPSD_SCONS_OPTS = \
sysroot=$(STAGING_DIR) \
strip=no \
python=no \
@@ -15,12 +15,18 @@ Index: buildroot/package/gpsd/gpsd.mk
systemd=$(if $(BR2_INIT_SYSTEMD),yes,no)
+ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python2.7"
++ifeq ($(BR2_PACKAGE_PYTHON),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)"
+GPSD_SCONS_OPTS += \
-+ python_libdir=/usr/lib/python2.7/
++ python_libdir=/usr/lib/python$(PYTHON_VERSION)/
++else ifeq ($(BR2_PACKAGE_PYTHON3),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m"
++GPSD_SCONS_OPTS += \
++ python_libdir=/usr/lib/python$(PYTHON3_VERSION)/
+else
+GPSD_SCONS_OPTS += python=no
+endif
++endif
+
ifeq ($(BR2_PACKAGE_NCURSES),y)
GPSD_DEPENDENCIES += ncurses
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-05 07:11:52
|
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 4fac84f2e35ae652aeef446fab23eae27fde1360 (commit)
from 4165eb9d7245bb8b72eb5eb616f7c4548dc43c6f (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 4fac84f2e35ae652aeef446fab23eae27fde1360
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jun 5 09:10:55 2020 +0200
[BUILDROOT] 2020.02: freescale-imx: backport patches to support i.MX8MN
-----------------------------------------------------------------------
Summary of changes:
...escale-imx-firmware-imx-add-support-for-i.patch | 35 ++++
...ackage-freescale-imx-imx-seco-new-package.patch | 105 ++++++++++
...escale-imx-firmware-imx-bump-version-to-8.patch | 69 +++++++
...escale-imx-imx-sc-firmware-bump-to-versio.patch | 45 +++++
...escale-imx-firmware-imx-fix-hashes-for-li.patch | 32 ++++
...escale-imx-imx-sc-firmware-fix-hashes-for.patch | 30 +++
...reescale-imx-fix-i.MX8MMini-configuration.patch | 42 ++++
...escale-imx-imx-vpu-hantro-bump-version-to.patch | 211 +++++++++++++++++++++
...escale-imx-kernel-module-imx-gpu-viv-bump.patch | 60 ++++++
...escale-imx-imx-vpu-bump-version-to-5.4.39.patch | 49 +++++
...-freescale-imx-add-option-for-i.MX8M-Nano.patch | 49 +++++
...escale-imx-firmware-imx-add-support-for-i.patch | 32 ++++
...nel-module-imx-gpu-viv-bear-the-kernel-op.patch | 31 +++
...-freescale-imx-Add-option-for-DDR-FW-need.patch | 66 +++++++
...escale-imx-firmware-imx-add-choice-for-DD.patch | 130 +++++++++++++
patches/buildroot/2020.02/cleanup_buildroot.sh | 18 ++
16 files changed, 1004 insertions(+)
create mode 100644 patches/buildroot/2020.02/350-package-freescale-imx-firmware-imx-add-support-for-i.patch
create mode 100644 patches/buildroot/2020.02/351-package-freescale-imx-imx-seco-new-package.patch
create mode 100644 patches/buildroot/2020.02/352-package-freescale-imx-firmware-imx-bump-version-to-8.patch
create mode 100644 patches/buildroot/2020.02/353-package-freescale-imx-imx-sc-firmware-bump-to-versio.patch
create mode 100644 patches/buildroot/2020.02/354-package-freescale-imx-firmware-imx-fix-hashes-for-li.patch
create mode 100644 patches/buildroot/2020.02/355-package-freescale-imx-imx-sc-firmware-fix-hashes-for.patch
create mode 100644 patches/buildroot/2020.02/356-package-freescale-imx-fix-i.MX8MMini-configuration.patch
create mode 100644 patches/buildroot/2020.02/357-package-freescale-imx-imx-vpu-hantro-bump-version-to.patch
create mode 100644 patches/buildroot/2020.02/358-package-freescale-imx-kernel-module-imx-gpu-viv-bump.patch
create mode 100644 patches/buildroot/2020.02/359-package-freescale-imx-imx-vpu-bump-version-to-5.4.39.patch
create mode 100644 patches/buildroot/2020.02/360-package-freescale-imx-add-option-for-i.MX8M-Nano.patch
create mode 100644 patches/buildroot/2020.02/361-package-freescale-imx-firmware-imx-add-support-for-i.patch
create mode 100644 patches/buildroot/2020.02/363-package-kernel-module-imx-gpu-viv-bear-the-kernel-op.patch
create mode 100644 patches/buildroot/2020.02/364-package-freescale-imx-Add-option-for-DDR-FW-need.patch
create mode 100644 patches/buildroot/2020.02/365-package-freescale-imx-firmware-imx-add-choice-for-DD.patch
diff --git a/patches/buildroot/2020.02/350-package-freescale-imx-firmware-imx-add-support-for-i.patch b/patches/buildroot/2020.02/350-package-freescale-imx-firmware-imx-add-support-for-i.patch
new file mode 100644
index 000000000..07d5aeee1
--- /dev/null
+++ b/patches/buildroot/2020.02/350-package-freescale-imx-firmware-imx-add-support-for-i.patch
@@ -0,0 +1,35 @@
+From 78995fb1d78a1638420550accfd50789109c7197 Mon Sep 17 00:00:00 2001
+From: Maeva Manuel <mae...@os...>
+Date: Wed, 4 Mar 2020 17:14:26 +0100
+Subject: [PATCH 350/365] package/freescale-imx/firmware-imx: add support for
+ i.MX8QM
+
+Signed-off-by: Maeva Manuel <mae...@os...>
+Tested-by: Julien Olivain <jul...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index b251fcda2a..7f14062f89 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -45,6 +45,14 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
+ $(BINARIES_DIR)/signed_hdmi_imx8m.bin
+ endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
++FIRMWARE_IMX_INSTALL_IMAGES = YES
++define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
++ # SECO firmware is needed when generating imx8-boot-sd.bin which
++ # is done in post-image script.
++ cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
++ $(BINARIES_DIR)/ahab-container.img
++endef
+ else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
+ FIRMWARE_IMX_INSTALL_IMAGES = YES
+ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/351-package-freescale-imx-imx-seco-new-package.patch b/patches/buildroot/2020.02/351-package-freescale-imx-imx-seco-new-package.patch
new file mode 100644
index 000000000..893935e12
--- /dev/null
+++ b/patches/buildroot/2020.02/351-package-freescale-imx-imx-seco-new-package.patch
@@ -0,0 +1,105 @@
+From 97d54bdcb2185914e232749fa4171601a9ec7f0d Mon Sep 17 00:00:00 2001
+From: Maeva Manuel <mae...@os...>
+Date: Fri, 20 Mar 2020 17:31:54 +0100
+Subject: [PATCH 351/365] package/freescale-imx/imx-seco: new package
+
+This package is needed with Freescale i.MX8/i.MX8X defconfigs
+version equal to 4.19.35_1.0.0
+It is also subject to multi-version support.
+
+The package version aligned with NXP BSP 4.19.35_1.1.0 is 2.3.1
+
+Signed-off-by: Maeva Manuel <mae...@os...>
+Reviewed-by: Julien Olivain <jul...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/Config.in | 1 +
+ package/freescale-imx/imx-seco/Config.in | 9 +++++
+ package/freescale-imx/imx-seco/imx-seco.hash | 4 +++
+ package/freescale-imx/imx-seco/imx-seco.mk | 35 ++++++++++++++++++++
+ 4 files changed, 49 insertions(+)
+ create mode 100644 package/freescale-imx/imx-seco/Config.in
+ create mode 100644 package/freescale-imx/imx-seco/imx-seco.hash
+ create mode 100644 package/freescale-imx/imx-seco/imx-seco.mk
+
+diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
+index 711e8f72c2..f42bb11a3c 100644
+--- a/package/freescale-imx/Config.in
++++ b/package/freescale-imx/Config.in
+@@ -101,6 +101,7 @@ source "package/freescale-imx/imx-vpu-hantro/Config.in"
+ source "package/freescale-imx/imx-vpuwrap/Config.in"
+ source "package/freescale-imx/firmware-imx/Config.in"
+ source "package/freescale-imx/imx-sc-firmware/Config.in"
++source "package/freescale-imx/imx-seco/Config.in"
+ if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53)
+ source "package/freescale-imx/gpu-amd-bin-mx51/Config.in"
+ source "package/freescale-imx/libz160/Config.in"
+diff --git a/package/freescale-imx/imx-seco/Config.in b/package/freescale-imx/imx-seco/Config.in
+new file mode 100644
+index 0000000000..1877664a0c
+--- /dev/null
++++ b/package/freescale-imx/imx-seco/Config.in
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_IMX_SECO
++ bool "imx-seco"
++ depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \
++ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
++ help
++ Firmware file for the i.MX8 and i.MX8X Security Controller.
++
++ This library is provided by Freescale as-is and doesn't have
++ an upstream.
+diff --git a/package/freescale-imx/imx-seco/imx-seco.hash b/package/freescale-imx/imx-seco/imx-seco.hash
+new file mode 100644
+index 0000000000..56f56369d4
+--- /dev/null
++++ b/package/freescale-imx/imx-seco/imx-seco.hash
+@@ -0,0 +1,4 @@
++# Locally calculated
++sha256 b429ac58b2ea1771b3fdf7ae87bf1d37ccaf596bde01a5ecccae27b2145f6824 imx-seco-2.3.1.bin
++sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
++sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
+diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk
+new file mode 100644
+index 0000000000..d06bf4c5cc
+--- /dev/null
++++ b/package/freescale-imx/imx-seco/imx-seco.mk
+@@ -0,0 +1,35 @@
++################################################################################
++#
++# imx-seco
++#
++################################################################################
++
++IMX_SECO_VERSION = 2.3.1
++IMX_SECO_SITE = $(FREESCALE_IMX_SITE)
++IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin
++
++IMX_SECO_LICENSE = NXP Semiconductor Software License Agreement
++IMX_SECO_LICENSE_FILES = EULA COPYING
++IMX_SECO_REDISTRIBUTE = NO
++
++define IMX_SECO_EXTRACT_CMDS
++ $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE))
++endef
++
++IMX_SECO_INSTALL_IMAGES = YES
++
++# SECO firmware is needed when generating imx8-boot-sd.bin which
++# is done in post-image script.
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
++define IMX_SECO_INSTALL_IMAGES_CMDS
++ cp $(@D)/firmware/seco/mx8qx-ahab-container.img \
++ $(BINARIES_DIR)/ahab-container.img
++endef
++else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
++define IMX_SECO_INSTALL_IMAGES_CMDS
++ cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
++ $(BINARIES_DIR)/ahab-container.img
++endef
++endif
++
++$(eval $(generic-package))
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/352-package-freescale-imx-firmware-imx-bump-version-to-8.patch b/patches/buildroot/2020.02/352-package-freescale-imx-firmware-imx-bump-version-to-8.patch
new file mode 100644
index 000000000..7dd4a7c6b
--- /dev/null
+++ b/patches/buildroot/2020.02/352-package-freescale-imx-firmware-imx-bump-version-to-8.patch
@@ -0,0 +1,69 @@
+From 8cc27a292e3433a0993b0e28573fa876a87b0a7a Mon Sep 17 00:00:00 2001
+From: Maeva Manuel <mae...@os...>
+Date: Fri, 20 Mar 2020 17:31:55 +0100
+Subject: [PATCH 352/365] package/freescale-imx/firmware-imx: bump version to
+ 8.5
+
+This package needed to be updated to be aligned with NXP
+BSP 4.19.35_1.1.0
+
+This newer 8.5 version no longer include ahab-container images.
+Those images are now in a separate imx-seco package.
+
+Signed-off-by: Maeva Manuel <mae...@os...>
+Reviewed-by: Julien Olivain <jul...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .../firmware-imx/firmware-imx.hash | 2 +-
+ .../freescale-imx/firmware-imx/firmware-imx.mk | 17 +----------------
+ 2 files changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash
+index 85f203311f..7b9f722881 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.hash
++++ b/package/freescale-imx/firmware-imx/firmware-imx.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated
+-sha256 c115d5d0d115fc14754671bd2428f672f9f99677988588accef2fbca2c3f749c firmware-imx-8.1.1.bin
++sha256 45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d firmware-imx-8.5.bin
+ sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
+ sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 7f14062f89..246bfdfaa1 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-FIRMWARE_IMX_VERSION = 8.1.1
++FIRMWARE_IMX_VERSION = 8.5
+ FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
+ FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
+
+@@ -45,22 +45,7 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
+ $(BINARIES_DIR)/signed_hdmi_imx8m.bin
+ endef
+-else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
+-FIRMWARE_IMX_INSTALL_IMAGES = YES
+-define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+- # SECO firmware is needed when generating imx8-boot-sd.bin which
+- # is done in post-image script.
+- cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
+- $(BINARIES_DIR)/ahab-container.img
+-endef
+ else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
+-FIRMWARE_IMX_INSTALL_IMAGES = YES
+-define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+- # SECO firmware is needed when generating imx8-boot-sd.bin which
+- # is done in post-image script.
+- cp $(@D)/firmware/seco/mx8qx-ahab-container.img \
+- $(BINARIES_DIR)/ahab-container.img
+-endef
+ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \
+ $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/353-package-freescale-imx-imx-sc-firmware-bump-to-versio.patch b/patches/buildroot/2020.02/353-package-freescale-imx-imx-sc-firmware-bump-to-versio.patch
new file mode 100644
index 000000000..be82cda43
--- /dev/null
+++ b/patches/buildroot/2020.02/353-package-freescale-imx-imx-sc-firmware-bump-to-versio.patch
@@ -0,0 +1,45 @@
+From f85c4a41701472a005ae17e67910290e08383b6f Mon Sep 17 00:00:00 2001
+From: Maeva Manuel <mae...@os...>
+Date: Fri, 20 Mar 2020 17:31:56 +0100
+Subject: [PATCH 353/365] package/freescale-imx/imx-sc-firmware: bump to
+ version 1.2.7.1
+
+This package needed to be updated to be aligned with NXP BSP
+4.19.35_1.1.0
+
+Signed-off-by: Maeva Manuel <mae...@os...>
+Reviewed-by: Julien Olivain <jul...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash | 6 +++---
+ package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
+index 013201911b..fb9c5e7f85 100644
+--- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
++++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated
+-sha256 c7b8fe249ba529d85bfe8540e073b73e4fcdf65ee56022c319e53e0065ff1549 imx-sc-firmware-1.2.1.bin
+-sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
+-sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
++sha256 5a28180217975f3d78fcfac15e46b0a942910fadf078e4af76deb6dc498136ed imx-sc-firmware-1.2.7.1.bin
++sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
++sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
+diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
+index 6a768ea109..954cfc4072 100644
+--- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
++++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-IMX_SC_FIRMWARE_VERSION = 1.2.1
++IMX_SC_FIRMWARE_VERSION = 1.2.7.1
+ IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE)
+ IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin
+
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/354-package-freescale-imx-firmware-imx-fix-hashes-for-li.patch b/patches/buildroot/2020.02/354-package-freescale-imx-firmware-imx-fix-hashes-for-li.patch
new file mode 100644
index 000000000..bdc5d7ec5
--- /dev/null
+++ b/patches/buildroot/2020.02/354-package-freescale-imx-firmware-imx-fix-hashes-for-li.patch
@@ -0,0 +1,32 @@
+From cd5ff04d79de177682b293dab44ea2db2fbfac47 Mon Sep 17 00:00:00 2001
+From: Julien Olivain <ju...@co...>
+Date: Sat, 21 Mar 2020 17:50:54 +0100
+Subject: [PATCH 354/365] package/freescale-imx/firmware-imx: fix hashes for
+ license files
+
+Commit 8cc27a292e3433a0993b0e28573fa876a87b0a7a updated package
+version but did not updated hashes for EULA and COPYING license files.
+The patch fixes "make legal-info" for firmware-imx package. Also
+adopt new spacing convention in .hash files (two spaces).
+
+Signed-off-by: Julien Olivain <ju...@co...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/freescale-imx/firmware-imx/firmware-imx.hash | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash
+index 7b9f722881..e49ce085bf 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.hash
++++ b/package/freescale-imx/firmware-imx/firmware-imx.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated
+-sha256 45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d firmware-imx-8.5.bin
+-sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
+-sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
++sha256 45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d firmware-imx-8.5.bin
++sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/355-package-freescale-imx-imx-sc-firmware-fix-hashes-for.patch b/patches/buildroot/2020.02/355-package-freescale-imx-imx-sc-firmware-fix-hashes-for.patch
new file mode 100644
index 000000000..b308ff62b
--- /dev/null
+++ b/patches/buildroot/2020.02/355-package-freescale-imx-imx-sc-firmware-fix-hashes-for.patch
@@ -0,0 +1,30 @@
+From de131e674e4272f5e610f85c6a142c8b1165aa95 Mon Sep 17 00:00:00 2001
+From: Julien Olivain <ju...@co...>
+Date: Sat, 21 Mar 2020 17:50:55 +0100
+Subject: [PATCH 355/365] package/freescale-imx/imx-sc-firmware: fix hashes for
+ license files
+
+Commit f85c4a41701472a005ae17e67910290e08383b6f updated package
+version but did not updated hashes for EULA and COPYING license files.
+The patch fixes "make legal-info" for imx-sc-firmware package.
+
+Signed-off-by: Julien Olivain <ju...@co...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
+index fb9c5e7f85..bd8de5b869 100644
+--- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
++++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated
+ sha256 5a28180217975f3d78fcfac15e46b0a942910fadf078e4af76deb6dc498136ed imx-sc-firmware-1.2.7.1.bin
+-sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA
+-sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING
++sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
++sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/356-package-freescale-imx-fix-i.MX8MMini-configuration.patch b/patches/buildroot/2020.02/356-package-freescale-imx-fix-i.MX8MMini-configuration.patch
new file mode 100644
index 000000000..b0a7354ea
--- /dev/null
+++ b/patches/buildroot/2020.02/356-package-freescale-imx-fix-i.MX8MMini-configuration.patch
@@ -0,0 +1,42 @@
+From 43890423ddb97a10d1fb96ada869a08cc4c98272 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 26 Mar 2020 17:49:42 +0100
+Subject: [PATCH 356/365] package/freescale-imx: fix i.MX8MMini configuration
+
+- Just like i.MX8MQ, i.MX8MMini is using Hantro VPU.
+- Platform name wasn't set for i.MX8Mini
+ -> now differencing IMX8MQ and IMX8MM for VPU package
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/Config.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
+index f42bb11a3c..0a5be9c75a 100644
+--- a/package/freescale-imx/Config.in
++++ b/package/freescale-imx/Config.in
+@@ -66,7 +66,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
+ default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
+ default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
+ default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
+- default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
++ default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
++ default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
+
+ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+ bool
+@@ -77,7 +78,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+
+ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
+ bool
+- default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
++ default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \
++ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
+
+ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
+ bool
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/357-package-freescale-imx-imx-vpu-hantro-bump-version-to.patch b/patches/buildroot/2020.02/357-package-freescale-imx-imx-vpu-hantro-bump-version-to.patch
new file mode 100644
index 000000000..241f3d079
--- /dev/null
+++ b/patches/buildroot/2020.02/357-package-freescale-imx-imx-vpu-hantro-bump-version-to.patch
@@ -0,0 +1,211 @@
+From d7f553ba9f129dfeda71ff05bc38219aa3b4d02b Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Mon, 30 Mar 2020 10:05:22 +0200
+Subject: [PATCH 357/365] package/freescale-imx/imx-vpu-hantro: bump version to
+ 1.15.0
+
+To match NXP BSP 4.19.35-1.1.0 release:
+https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-bsp/imx-vpu-hantro?h=warrior-4.19.35-1.1.0
+
+Adds support for i.MX8MMini platform (Hantro H1 encoder).
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Tested-by: Laurent Gauthier <lau...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...on.h-header-inclusion-to-be-standard.patch | 64 ++++++++++++++-----
+ ...0002-Fix-build-with-uclibc-toolchain.patch | 51 +++++++++++++++
+ .../imx-vpu-hantro/imx-vpu-hantro.hash | 6 +-
+ .../imx-vpu-hantro/imx-vpu-hantro.mk | 5 +-
+ 4 files changed, 105 insertions(+), 21 deletions(-)
+ create mode 100644 package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch
+
+diff --git a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+index 951ead9824..f5a67cd514 100644
+--- a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
++++ b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+@@ -1,6 +1,6 @@
+-From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
++From e776e7360f80da9ac03f81a5df27d8b7fabc7ac7 Mon Sep 17 00:00:00 2001
+ From: Gary Bisson <gar...@bo...>
+-Date: Thu, 12 Jul 2018 11:38:28 +0200
++Date: Thu, 26 Mar 2020 16:00:33 +0100
+ Subject: [PATCH] Fix ion.h header inclusion to be standard
+
+ NXP "solution" was to manually copy the header to include/linux.
+@@ -9,25 +9,44 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
+
+ Signed-off-by: Gary Bisson <gar...@bo...>
+ ---
+- Makefile | 2 ++
+- decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
+- 2 files changed, 3 insertions(+), 1 deletion(-)
++ Makefile_G1G2 | 4 ++--
++ Makefile_H1 | 4 ++--
++ decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
++ h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +-
++ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+-diff --git a/Makefile b/Makefile
+-index b74e23a..a5ce22b 100755
+---- a/Makefile
+-+++ b/Makefile
+-@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
++diff --git a/Makefile_G1G2 b/Makefile_G1G2
++index 8280cce..4c9fc34 100755
++--- a/Makefile_G1G2
+++++ b/Makefile_G1G2
++@@ -10,8 +10,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
++
+ INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
+ #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
+- INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+-+# ION header location
++-#INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
++-INCLUDE_HEADERS += -I$(SDKTARGETSYSROOT)/usr/include/imx
+++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+ +INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+
+ CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
+ -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
++diff --git a/Makefile_H1 b/Makefile_H1
++index 9ab62e1..8d366e3 100755
++--- a/Makefile_H1
+++++ b/Makefile_H1
++@@ -17,8 +17,8 @@ ENV += -DMEMALLOC_MODULE_PATH=\\\"/dev/ion\\\"
++ #ENV += -DSDRAM_LM_BASE=0x00000000
++ ENV += -DEWL_NO_HW_TIMEOUT
++ ENV += -DUSE_ION
++-#ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
++-ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx
+++ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+++ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
++
++ LIBENCNAME = libcodec_enc
++ LIBSENC = -L./ -lhantro_h1 -lpthread
+ diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
+-index 8183660..ed37d86 100644
++index 9b057f0..43225f6 100755
+ --- a/decoder_sw/software/linux/dwl/dwl_linux.c
+ +++ b/decoder_sw/software/linux/dwl/dwl_linux.c
+ @@ -41,7 +41,7 @@
+@@ -36,9 +55,22 @@ index 8183660..ed37d86 100644
+ #ifdef USE_ION
+ -#include <linux/ion.h>
+ +#include <ion.h>
++ #include <linux/dma-buf.h>
++ #include <linux/version.h>
++ #ifdef ANDROID
++diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
++index fef1307..20b6f95 100755
++--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+++++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
++@@ -49,7 +49,7 @@
++
++ #include "linux/hx280enc.h"
++ #ifdef USE_ION
++-#include <linux/ion.h>
+++#include <ion.h>
++ #include <linux/dma-buf.h>
++ #include <linux/version.h>
+ #ifdef ANDROID
+- #include <linux/mxc_ion.h>
+- #endif
+ --
+-2.18.0
++2.25.1
+
+diff --git a/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch b/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch
+new file mode 100644
+index 0000000000..eb18043c4b
+--- /dev/null
++++ b/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch
+@@ -0,0 +1,51 @@
++From 4f51b0a6b9a36cc56fa06eb0f76596d8e387f980 Mon Sep 17 00:00:00 2001
++From: Gary Bisson <gar...@bo...>
++Date: Fri, 27 Mar 2020 23:17:30 +0100
++Subject: [PATCH] Fix build with uclibc toolchain
++
++From: Laurent Gauthier (OSS) <lau...@os...>
++
++By default, backtrace support is disabled in uclibc. In that case the
++execinfo.h header file is missing, producing a build error.
++
++Signed-off-by: Laurent Gauthier (OSS) <lau...@os...>
++Signed-off-by: Gary Bisson <gar...@bo...>
++---
++ openmax_il/source/dbgmacros.h | 14 +++++++-------
++ 1 file changed, 7 insertions(+), 7 deletions(-)
++
++diff --git a/openmax_il/source/dbgmacros.h b/openmax_il/source/dbgmacros.h
++index 3771c91..37ae09f 100755
++--- a/openmax_il/source/dbgmacros.h
+++++ b/openmax_il/source/dbgmacros.h
++@@ -50,13 +50,6 @@
++ # define __USE_GNU
++ #endif
++
++-#ifndef ANDROID
++-#include <execinfo.h>
++-#include <link.h>
++-#endif
++-#include <dlfcn.h>
++-#include <elf.h>
++-
++ /*****************
++ ** DEBUG FLAGS **
++ *****************/
++@@ -76,6 +69,13 @@
++ #define TRACE_FILE "trace.log"
++ #endif
++
+++#ifndef ANDROID
+++#include <execinfo.h>
+++#include <link.h>
+++#endif
+++#include <dlfcn.h>
+++#include <elf.h>
+++
++ #ifdef LOG_IN_FILE
++ #define TRACE(...) \
++ { \
++--
++2.25.1
++
+diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
+index 4fa48fb806..7f02f92467 100644
+--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
++++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
+@@ -1,3 +1,3 @@
+-sha256 cbc648e41f005aad209f74c9e5dd346138dca12efeb7b27e471de7474c4da302 imx-vpu-hantro-1.6.0.bin
+-sha256 0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a COPYING
+-sha256 faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a EULA
++sha256 8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5 imx-vpu-hantro-1.15.0.bin
++sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
++sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
+diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+index a82899e64b..dbdbd4dc7b 100644
+--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
++++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-IMX_VPU_HANTRO_VERSION = 1.6.0
++IMX_VPU_HANTRO_VERSION = 1.15.0
+ IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE)
+ IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin
+ IMX_VPU_HANTRO_DEPENDENCIES = linux
+@@ -15,7 +15,8 @@ IMX_VPU_HANTRO_MAKE_ENV = \
+ $(TARGET_CONFIGURE_OPTS) \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ SDKTARGETSYSROOT=$(STAGING_DIR) \
+- LINUX_KERNEL_ROOT=$(LINUX_DIR)
++ LINUX_KERNEL_ROOT=$(LINUX_DIR) \
++ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM)
+
+ IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement
+ IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/358-package-freescale-imx-kernel-module-imx-gpu-viv-bump.patch b/patches/buildroot/2020.02/358-package-freescale-imx-kernel-module-imx-gpu-viv-bump.patch
new file mode 100644
index 000000000..3a406c352
--- /dev/null
+++ b/patches/buildroot/2020.02/358-package-freescale-imx-kernel-module-imx-gpu-viv-bump.patch
@@ -0,0 +1,60 @@
+From a8b39ad9019afa0636a96f3a5f32041976a20c70 Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Thu, 2 Apr 2020 15:08:41 +0200
+Subject: [PATCH 358/365] package/freescale-imx/kernel-module-imx-gpu-viv: bump
+ to version 6.4.0.p1.0
+
+This package has been tested on Nitrogen8M with the following commands:
+ # modprobe galcore
+ # cd /usr/share/examples/viv_samples/vdk/
+ # ./tutorial7
+
+Also update the help text as we shouldn't specify a kernel revision. It
+is just that this module isn't meant for mainline kernel, only its NXP
+forked version.
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/kernel-module-imx-gpu-viv/Config.in | 2 +-
+ .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash | 2 +-
+ .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in b/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
+index 038bd4d483..4cea37a46c 100644
+--- a/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
++++ b/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
+@@ -11,6 +11,6 @@ config BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV
+ source code of the same version as base and include fixes
+ and improvements developed by FSL Community.
+
+- This module is only meant for NXP-based kernel up to 4.1.x.
++ This module is only meant for NXP-based kernel.
+
+ https://github.com/Freescale/kernel-module-imx-gpu-viv
+diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
+index 19341db6ba..fe40692a6b 100644
+--- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
++++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
+@@ -1,3 +1,3 @@
+ # locally computed
+-sha256 ad910b7d36dc433bbbe85808d278312e9199635aaa5d00097b70ffab11bde9e6 kernel-module-imx-gpu-viv-86354002bea77acd9ce1812712e9d8485b377ec8.tar.gz
++sha256 d747c39f900315f2f46b8397f55d199c7ece7328ae91ce21a2f5eb0895603865 kernel-module-imx-gpu-viv-4cc1368dc05073b368cfdbadfdf5de3a3d3b15f4.tar.gz
+ sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
+diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+index c76a5ee386..e087ccaa12 100644
+--- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
++++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-KERNEL_MODULE_IMX_GPU_VIV_VERSION = 86354002bea77acd9ce1812712e9d8485b377ec8
++KERNEL_MODULE_IMX_GPU_VIV_VERSION = 4cc1368dc05073b368cfdbadfdf5de3a3d3b15f4
+ KERNEL_MODULE_IMX_GPU_VIV_SITE = \
+ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION))
+ KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/359-package-freescale-imx-imx-vpu-bump-version-to-5.4.39.patch b/patches/buildroot/2020.02/359-package-freescale-imx-imx-vpu-bump-version-to-5.4.39.patch
new file mode 100644
index 000000000..730d9f110
--- /dev/null
+++ b/patches/buildroot/2020.02/359-package-freescale-imx-imx-vpu-bump-version-to-5.4.39.patch
@@ -0,0 +1,49 @@
+From e9aaf2125f34c8736817c8b97fb897223fb3bd13 Mon Sep 17 00:00:00 2001
+From: Laurent GAUTHIER <lau...@os...>
+Date: Tue, 7 Apr 2020 22:20:42 +0200
+Subject: [PATCH 359/365] package/freescale-imx/imx-vpu: bump version to
+ 5.4.39.1
+
+To match NXP BSP 4.19.35_1.1.0 release:
+https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-bsp/imx-vpu?h=warrior-4.19.35-1.1.0
+
+The license files have changed significantly, but it remains an NXP
+Semiconductor Software License Agreement.
+
+Reviewed-by: Maeva Manuel <mae...@os...>
+Reviewed-by: Julien Olivain <jul...@os...>
+Signed-off-by: Laurent Gauthier <lau...@os...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/imx-vpu/imx-vpu.hash | 6 +++---
+ package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/freescale-imx/imx-vpu/imx-vpu.hash b/package/freescale-imx/imx-vpu/imx-vpu.hash
+index 5fa93d8055..81ea35a7fb 100644
+--- a/package/freescale-imx/imx-vpu/imx-vpu.hash
++++ b/package/freescale-imx/imx-vpu/imx-vpu.hash
+@@ -1,4 +1,4 @@
+ # Locally computed
+-sha256 34bed0ddf6c797f444bddfa5d5495adc751ff268b6431d8beb48129c89c9e47f imx-vpu-5.4.38.bin
+-sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING
+-sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA
++sha256 b7bb67b00daf436fd91a2760c2db375a962e2c919045ce8bf81bd54b95d999c5 imx-vpu-5.4.39.1.bin
++sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING
++sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA
+diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
+index e30237508e..e61b9f829a 100644
+--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
++++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-IMX_VPU_VERSION = 5.4.38
++IMX_VPU_VERSION = 5.4.39.1
+ IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
+ IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
+
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/360-package-freescale-imx-add-option-for-i.MX8M-Nano.patch b/patches/buildroot/2020.02/360-package-freescale-imx-add-option-for-i.MX8M-Nano.patch
new file mode 100644
index 000000000..a9a20dfeb
--- /dev/null
+++ b/patches/buildroot/2020.02/360-package-freescale-imx-add-option-for-i.MX8M-Nano.patch
@@ -0,0 +1,49 @@
+From 822b61d2df4fccb6c2b0b098ed0c79f03481dfaf Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Wed, 15 Apr 2020 18:18:25 +0200
+Subject: [PATCH 360/365] package/freescale-imx: add option for i.MX8M Nano
+
+The i.MX8M Nano is slightly different from the i.MX8M Mini but very
+close (pin to pin compatible).
+Mainly the Nano version has no VPU and another GPU (GC7000UL).
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Cc: Refik Tuzakli <tuz...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/Config.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
+index 0a5be9c75a..b0c7de8436 100644
+--- a/package/freescale-imx/Config.in
++++ b/package/freescale-imx/Config.in
+@@ -49,6 +49,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
+ bool "imx8mm"
+
++config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN
++ bool "imx8mn"
++
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+ bool "imx8x"
+ endchoice
+@@ -68,6 +71,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
+ default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
+ default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+ default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
++ default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN
+
+ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
+ bool
+@@ -89,6 +93,7 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \
++ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+
+ source "package/freescale-imx/imx-alsa-plugins/Config.in"
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/361-package-freescale-imx-firmware-imx-add-support-for-i.patch b/patches/buildroot/2020.02/361-package-freescale-imx-firmware-imx-add-support-for-i.patch
new file mode 100644
index 000000000..407512877
--- /dev/null
+++ b/patches/buildroot/2020.02/361-package-freescale-imx-firmware-imx-add-support-for-i.patch
@@ -0,0 +1,32 @@
+From 0abeb4c10dca9ae353c70a7cb2471bba0a3dd40e Mon Sep 17 00:00:00 2001
+From: Gary Bisson <gar...@bo...>
+Date: Wed, 15 Apr 2020 18:18:26 +0200
+Subject: [PATCH 361/365] package/freescale-imx/firmware-imx: add support for
+ i.MX8M Nano
+
+This CPU requires the same (LP)DDR training binaries as i.MX8M Mini.
+
+Signed-off-by: Gary Bisson <gar...@bo...>
+Cc: Refik Tuzakli <tuz...@gm...>
+Cc: Arnout Vandecappelle <ar...@mi...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 246bfdfaa1..cd0dafb3de 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -18,7 +18,7 @@ define FIRMWARE_IMX_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
+ endef
+
+-ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y)
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y)
+ FIRMWARE_IMX_INSTALL_IMAGES = YES
+ FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys
+ define FIRMWARE_IMX_PREPARE_LPDDR4_FW
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/363-package-kernel-module-imx-gpu-viv-bear-the-kernel-op.patch b/patches/buildroot/2020.02/363-package-kernel-module-imx-gpu-viv-bear-the-kernel-op.patch
new file mode 100644
index 000000000..be2efcc6b
--- /dev/null
+++ b/patches/buildroot/2020.02/363-package-kernel-module-imx-gpu-viv-bear-the-kernel-op.patch
@@ -0,0 +1,31 @@
+From 391c448acbb9a66ddb43804dbcea677da0651a8f Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yan...@fr...>
+Date: Sat, 4 Apr 2020 14:10:34 +0200
+Subject: [PATCH 363/365] package/kernel-module-imx-gpu-viv: bear the kernel
+ options munging
+
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+Cc: Gary Bisson <bis...@gm...>
+Cc: Refik Tuzakli <tuz...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+index e087ccaa12..a037858cfc 100644
+--- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
++++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+@@ -16,5 +16,9 @@ KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \
+
+ KERNEL_MODULE_IMX_GPU_VIV_MODULE_SUBDIRS = kernel-module-imx-gpu-viv-src
+
++define KERNEL_MODULE_IMX_GPU_VIV_MODULE_LINUX_CONFIG_FIXUPS
++ $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV)
++endef
++
+ $(eval $(kernel-module))
+ $(eval $(generic-package))
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/364-package-freescale-imx-Add-option-for-DDR-FW-need.patch b/patches/buildroot/2020.02/364-package-freescale-imx-Add-option-for-DDR-FW-need.patch
new file mode 100644
index 000000000..247ebbdc7
--- /dev/null
+++ b/patches/buildroot/2020.02/364-package-freescale-imx-Add-option-for-DDR-FW-need.patch
@@ -0,0 +1,66 @@
+From 6bb7f3b81092e7005470c7d689a566dbc1d059c6 Mon Sep 17 00:00:00 2001
+From: Stephane Viau <ste...@os...>
+Date: Wed, 27 May 2020 07:07:44 +0200
+Subject: [PATCH 364/365] package/freescale-imx: Add option for DDR FW need
+
+Only some i.MX8 needs a DDR training firmware (8M, 8MM, 8MN). Some other
+i.MX8 (QuadMax, QuadXPlus) rely on system controller for that task.
+
+Suggested-by: Julien Olivain <jul...@os...>
+Signed-off-by: Stephane Viau <ste...@os...>
+Reviewed-by: Gary Bisson <gar...@bo...>
+[yan...@fr...:
+ - use the new variable to drive the firmware installation
+]
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/freescale-imx/Config.in | 6 ++++++
+ package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
+index b0c7de8436..0be37ce956 100644
+--- a/package/freescale-imx/Config.in
++++ b/package/freescale-imx/Config.in
+@@ -45,12 +45,15 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
+
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+ bool "imx8m"
++ select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW
+
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
+ bool "imx8mm"
++ select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW
+
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN
+ bool "imx8mn"
++ select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW
+
+ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+ bool "imx8x"
+@@ -96,6 +99,9 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \
+ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+
++config BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW
++ bool
++
+ source "package/freescale-imx/imx-alsa-plugins/Config.in"
+ source "package/freescale-imx/imx-codec/Config.in"
+ source "package/freescale-imx/imx-kobs/Config.in"
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index cd0dafb3de..7309d21b7a 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -18,7 +18,7 @@ define FIRMWARE_IMX_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
+ endef
+
+-ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y)
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y)
+ FIRMWARE_IMX_INSTALL_IMAGES = YES
+ FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys
+ define FIRMWARE_IMX_PREPARE_LPDDR4_FW
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/365-package-freescale-imx-firmware-imx-add-choice-for-DD.patch b/patches/buildroot/2020.02/365-package-freescale-imx-firmware-imx-add-choice-for-DD.patch
new file mode 100644
index 000000000..a508c16b5
--- /dev/null
+++ b/patches/buildroot/2020.02/365-package-freescale-imx-firmware-imx-add-choice-for-DD.patch
@@ -0,0 +1,130 @@
+From d981a3227e4341c9c4639f070e8aae46e40c91bd Mon Sep 17 00:00:00 2001
+From: Stephane Viau <ste...@os...>
+Date: Wed, 27 May 2020 07:07:45 +0200
+Subject: [PATCH 365/365] package/freescale-imx/firmware-imx: add choice for
+ DDR training binaries
+
+Several i.MX8 (e.g.: 8M, 8MM, 8MN) support many DDR types (LPDDR4, DDR4,
+etc.), for which the DDR training is performed in the bootloader.
+Some boards have LPDDR4 (e.g.: nitrogen8mn) and some others have the DDR4
+(e.g.: NXP's reference board EVK). This patch allows the selection of either
+of the binaries used to train the DDR.
+
+Note that DDR and HDMI FW copies are now separated, which makes latter
+being properly copied only for the relevant SoC (i.MX8MQ).
+Suggested-by: Gary Bisson <gar...@bo...>
+
+Signed-off-by: Stephane Viau <ste...@os...>
+Reviewed-by: Maeva Manuel <mae...@os...>
+Reviewed-by: Julien Olivain <jul...@os...>
+Reviewed-by: Gary Bisson <gar...@bo...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/freescale-imx/firmware-imx/Config.in | 24 +++++++++++
+ .../firmware-imx/firmware-imx.mk | 41 ++++++++++++++++++-
+ 2 files changed, 64 insertions(+), 1 deletion(-)
+
+diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in
+index 56d5b80741..4962992346 100644
+--- a/package/freescale-imx/firmware-imx/Config.in
++++ b/package/freescale-imx/firmware-imx/Config.in
+@@ -8,3 +8,27 @@ config BR2_PACKAGE_FIRMWARE_IMX
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
++
++if BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW
++
++choice
++ bool "DDR training binaries"
++ default BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4
++ help
++ Choose the DDR training binaries to be used depending on the
++ kind of memory that is available on the target board (DDR4,
++ LPDDR4, etc...).
++
++config BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4
++ bool "lpddr4"
++ help
++ Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin)
++
++config BR2_PACKAGE_FIRMWARE_DDRFW_DDR4
++ bool "DDR4"
++ help
++ Use DDR4 binaries (i.e.: ddr4_*_201810.bin).
++
++endchoice # DDR training FW
++
++endif
+diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
+index 7309d21b7a..9fd1c54b48 100644
+--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
++++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
+@@ -20,6 +20,8 @@ endef
+
+ ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y)
+ FIRMWARE_IMX_INSTALL_IMAGES = YES
++
++ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4),y)
+ FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys
+ define FIRMWARE_IMX_PREPARE_LPDDR4_FW
+ $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \
+@@ -33,7 +35,7 @@ define FIRMWARE_IMX_PREPARE_LPDDR4_FW
+ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_fw.bin
+ endef
+
+-define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
++define FIRMWARE_IMX_PREPARE_DDR_FW
+ # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin.
+ # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin
+ # which is done in post-image script.
+@@ -42,9 +44,46 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \
+ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \
+ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin
++ ln -sf $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin $(BINARIES_DIR)/ddr_fw.bin
++endef
++else ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_DDR4),y)
++FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys
++define FIRMWARE_IMX_PREPARE_DDR4_FW
++ $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810.bin \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810_pad.bin
++ $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810.bin \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810_pad.bin
++ cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810_pad.bin \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810_pad.bin > \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_$(1)_201810_fw.bin
++endef
++
++define FIRMWARE_IMX_PREPARE_DDR_FW
++ # Create padded versions of ddr4_* and generate ddr4_fw.bin.
++ # ddr4_fw.bin is needed when generating imx8-boot-sd.bin
++ # which is done in post-image script.
++ $(call FIRMWARE_IMX_PREPARE_DDR4_FW,1d)
++ $(call FIRMWARE_IMX_PREPARE_DDR4_FW,2d)
++ cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \
++ $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \
++ $(BINARIES_DIR)/ddr4_201810_fw.bin
++ ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin
++endef
++endif
++
++ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y)
++define FIRMWARE_IMX_PREPARE_HDMI_FW
+ cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
+ $(BINARIES_DIR)/signed_hdmi_imx8m.bin
+ endef
++endif
++
++define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
++ $(FIRMWARE_IMX_PREPARE_DDR_FW)
++ $(FIRMWARE_IMX_PREPARE_HDMI_FW)
++endef
+ else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
+ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \
+--
+2.26.2
+
diff --git a/patches/buildroot/2020.02/cleanup_buildroot.sh b/patches/buildroot/2020.02/cleanup_buildroot.sh
index c9ceede6f..d93bfdcf8 100755
--- a/patches/buildroot/2020.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2020.02/cleanup_buildroot.sh
@@ -34,6 +34,24 @@ rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
rm -rf buildroot/package/fbgrab/0100-fix-pixfmt-report.patch
rm -rf buildroot/package/fbgrab/fbgrab.hash
rm -rf buildroot/package/fbgrab/fbgrab.mk
+rm -rf buildroot/package/freescale-imx/Config.in
+rm -rf buildroot/package/freescale-imx/firmware-imx/Config.in
+rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
+rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
+rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
+rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
+rm -rf buildroot/package/freescale-imx/imx-seco/Config.in
+rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.hash
+rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.mk
+rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/0002-Fix-build-with-uclibc-toolchain.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
+rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+rm -rf buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
+rm -rf buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
+rm -rf buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
+rm -rf buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
+rm -rf buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2020-06-03 08:40:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4165eb9d7245bb8b72eb5eb616f7c4548dc43c6f (commit)
from 126b53b361a402793235ab6b48c5d184b49f54fe (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 4165eb9d7245bb8b72eb5eb616f7c4548dc43c6f
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jun 3 10:39:57 2020 +0200
[BUILDROOT] BR2_TARGET_ARMADEUS depends on BR2_aarch64
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/Config.in b/buildroot/target/device/armadeus/Config.in
index 262edf583..7f54148b3 100644
--- a/buildroot/target/device/armadeus/Config.in
+++ b/buildroot/target/device/armadeus/Config.in
@@ -1,8 +1,8 @@
menuconfig BR2_TARGET_ARMADEUS
bool "Armadeus Device Support"
- depends on BR2_arm
+ depends on BR2_arm || BR2_aarch64
help
- Armadeus ARM based systems
+ Armadeus ARM / ARM64 based systems
if BR2_TARGET_ARMADEUS
hooks/post-receive
--
armadeus
|