[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-199-gf48208fdd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-199-gf48208fdd
|
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
|