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