Skip to contentSkip to conversation

updates of the NXP i.MX8QM/QXP

PATCH New Maeva Manuel 2 participants 10 messages Mar 20, 2020 – Mar 21, 2020 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

cover updates of the NXP i.MX8QM/QXP

The patch queue updates the defconfigs for NXP i.MX8QM and i.MX8QXP to NXP BSP 4.19.35_1.1.0 and the necessary BSP dependancies (imx-seco, firmware-imx, imx-sc-firmware, imx-mkimage).

Maeva Manuel (5):
package/freescale-imx/imx-seco: new package package/freescale-imx/firmware-imx: bump version to 8.5 package/freescale-imx/imx-sc-firmware: bump to version 1.2.7.1 package/imx-mkimage: bump to version rel_imx_4.19.35_1.1.0 configs/freescale_imx8q{m,xp}mek: bump BSP components to 4.19.35_1.1.0

 DEVELOPERS                                    |  1 +
 configs/freescale_imx8qmmek_defconfig         |  9 ++---
 configs/freescale_imx8qxpmek_defconfig        |  9 ++---
 package/freescale-imx/Config.in               |  1 +
 .../firmware-imx/firmware-imx.hash            |  2 +-
 .../firmware-imx/firmware-imx.mk              | 16 +--------
 .../imx-sc-firmware/imx-sc-firmware.hash      |  6 ++--
 .../imx-sc-firmware/imx-sc-firmware.mk        |  2 +-
 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 +++++++++++++++++++
 ...verriding-BL32-and-BL33-not-only-BL.patch} | 28 ++++++++-------
 .../0002-Add-LDFLAGS-to-link-step.patch       | 26 ++++++++++++++
 .../0002-add-ldflags-to-link-step.patch       | 26 --------------
 .../0003-Add-unused-fake-version.patch        | 11 +++---
 package/imx-mkimage/imx-mkimage.hash          |  2 +-
 package/imx-mkimage/imx-mkimage.mk            |  2 +-
 17 files changed, 116 insertions(+), 73 deletions(-)
 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
 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} (65%)
 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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/5 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

---
 DEVELOPERS                                   |  1 +
 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 ++++++++++++++++++++
 5 files changed, 50 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
DEVELOPERS +1 -0
index 8c736efcca..c3d5e330dd 100644
@@ -1529,6 +1529,7 @@ F:	package/wilc1000-firmware/
 N:	Maeva Manuel <[email protected]>
 F:	board/freescale/imx8qmmek/
 F:	configs/freescale_imx8qmmek_defconfig
+F:	package/freescale-imx/imx-seco/
 
 N:	Mahyar Koshkouei <[email protected]>
 F:	package/ffmpeg/
package/freescale-imx/Config.in +1 -0
index 711e8f72c2..f42bb11a3c 100644
@@ -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"
package/freescale-imx/imx-seco/Config.in new file +9 -0
new file mode 100644
index 0000000000..1877664a0c
@@ -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.
package/freescale-imx/imx-seco/imx-seco.hash new file +4 -0
new file mode 100644
index 0000000000..56f56369d4
@@ -0,0 +1,4 @@
+# Locally calculated
+sha256  b429ac58b2ea1771b3fdf7ae87bf1d37ccaf596bde01a5ecccae27b2145f6824  imx-seco-2.3.1.bin
+sha256  69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c  EULA
+sha256  6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46  COPYING
package/freescale-imx/imx-seco/imx-seco.mk new file +35 -0
new file mode 100644
index 0000000000..d06bf4c5cc
@@ -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))
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/5 package/freescale-imx/firmware-imx: bump version to 8.5

In reply to Maeva Manuel

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.

---
 .../freescale-imx/firmware-imx/firmware-imx.hash |  2 +-
 .../freescale-imx/firmware-imx/firmware-imx.mk   | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)
package/freescale-imx/firmware-imx/firmware-imx.hash +1 -1
index 85f203311f..7b9f722881 100644
@@ -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
package/freescale-imx/firmware-imx/firmware-imx.mk +1 -15
index 7f14062f89..963120fa9a 100644
@@ -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,8 @@ 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
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/5 package/freescale-imx/firmware-imx: bump version to 8.5

Hello Maeva,

package/freescale-imx/firmware-imx/firmware-imx.mk define FIRMWARE_IMX_INSTALL_IMAGES_CMDS · line 49

Quoted 10 lines · On Fri, 20 Mar 2020 17:31:55 +0100 Maeva Manuel <[email protected]>…
package/freescale-imx/firmware-imx/firmware-imx.mk +0 -8
-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

This line was no longer needed, since you're dropping FIRMWARE_IMX_INSTALL_IMAGES_CMDS below.

package/freescale-imx/firmware-imx/firmware-imx.mk define FIRMWARE_IMX_INSTALL_IMAGES_CMDS · line 63

Quoted 6 lines
package/freescale-imx/firmware-imx/firmware-imx.mk +0 -6
-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

However, more generally, I dislike this firmware-imx package. It seems to have been progressively patched with more and more logic, without much consistency. For example, the VPU blobs for i.MX8 are not installed for BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M and BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM. Is this normal ?

For platforms other than BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M, BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM and BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X, we install all VPU blobs and SDMA blobs, even those that are not relevant for the selected platform.

I think it really needs a complete rewrite, with a careful look at all firmware files that are provided by NXP in this package, and see which ones are applicable to which platform.

It would be great if you could have a look at doing such a cleanup.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 3/5 package/freescale-imx/imx-sc-firmware: bump to version 1.2.7.1

In reply to Maeva Manuel

This package needed to be updated to be aligned with NXP BSP 4.19.35_1.1.0

---
 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(-)
package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +3 -3
index 013201911b..fb9c5e7f85 100644
@@ -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
package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +1 -1
index 6a768ea109..954cfc4072 100644
@@ -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
 
Signature · 1 line
2.17.1
#5 lore raw

PATCH 4/5 package/imx-mkimage: bump to version rel_imx_4.19.35_1.1.0

In reply to Maeva Manuel

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

---
 ...verriding-BL32-and-BL33-not-only-BL.patch} | 28 ++++++++++---------
 .../0002-Add-LDFLAGS-to-link-step.patch       | 26 +++++++++++++++++
 .../0002-add-ldflags-to-link-step.patch       | 26 -----------------
 .../0003-Add-unused-fake-version.patch        | 11 +++++---
 package/imx-mkimage/imx-mkimage.hash          |  2 +-
 package/imx-mkimage/imx-mkimage.mk            |  2 +-
 6 files changed, 50 insertions(+), 45 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} (65%)
 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
package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch renamed from package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch +15 -13
similarity index 65%
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..fde1ccfaa9 100644
@@ -1,20 +1,20 @@
-From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001
+From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001
 From: Erik Larsson <[email protected]>
 Date: Thu, 8 Mar 2018 19:04:37 +0100
-Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
+Subject: [PATCH 1/3] Add support for overriding BL32 and BL33 not only BL31
 
 Signed-off-by: Erik Larsson <[email protected]>
 Signed-off-by: Christopher Dahlberg <[email protected]>
 Signed-off-by: Marcus Folkesson <[email protected]>
 ---
- 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 at 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 at 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
 
package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch new file +26 -0
new file mode 100644
index 0000000000..48d04868f6
@@ -0,0 +1,26 @@
+From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001
+From: Erik Larsson <[email protected]>
+Date: Tue, 6 Mar 2018 12:28:39 +0100
+Subject: [PATCH 2/3] Add LDFLAGS to link step
+
+Signed-off-by: Erik Larsson <[email protected]>
+---
+ 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
+
package/imx-mkimage/0002-add-ldflags-to-link-step.patch deleted +0 -26
deleted file mode 100644
index 1d5fe77596..0000000000
@@ -1,26 +0,0 @@
-From a73f20fbe921c7ecff3efda23bc506fdd935ee4d Mon Sep 17 00:00:00 2001
-From: Erik Larsson <[email protected]>
-Date: Tue, 6 Mar 2018 12:28:39 +0100
-Subject: [PATCH] Add LDFLAGS to link step
-
-Signed-off-by: Erik Larsson <[email protected]>
----
- 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
---- a/iMX8M/soc.mak
-+++ b/iMX8M/soc.mak
-@@ -15,7 +15,7 @@ FW_DIR = imx-boot/imx-boot-tools/imx8mq
- 
- $(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" 
--- 
-2.7.4
-
package/imx-mkimage/0003-Add-unused-fake-version.patch +7 -4
index 9652a817ba..7404343d9c 100644
@@ -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?= <[email protected]>
 Date: Mon, 25 Feb 2019 22:15:55 +0100
-Subject: [PATCH] Add unused fake version
+Subject: [PATCH 3/3] 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 <[email protected]>
  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
 
package/imx-mkimage/imx-mkimage.hash +1 -1
index e75619b8d4..6d5a329ed5 100644
@@ -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
package/imx-mkimage/imx-mkimage.mk +1 -1
index a58ddf07b7..270ef2ee01 100644
@@ -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+
Signature · 1 line
2.17.1
#6 lore raw

PATCH 4/5 package/imx-mkimage: bump to version rel_imx_4.19.35_1.1.0

package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch line 4

Quoted 6 lines · On Fri, 20 Mar 2020 17:31:57 +0100 Maeva Manuel <[email protected]>…
package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch renamed from package/imx-mkimage/0001-add-support-for-overriding-bl32-and-bl33-not-only-bl.patch +2 -2
-From 0677e6cff00506de56d11bfa230b6c366e74f6ed Mon Sep 17 00:00:00 2001
+From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001
 From: Erik Larsson <[email protected]>
 Date: Thu, 8 Mar 2018 19:04:37 +0100
-Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
+Subject: [PATCH 1/3] Add support for overriding BL32 and BL33 not only BL31

Please generate patches with "git format-patch -N" to have the 1/3, 2/3 and 3/3 numbering inside the patches.

I fixed that when applying.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 5/5 configs/freescale_imx8q{m, xp}mek: bump BSP components to 4.19.35_1.1.0

In reply to Maeva Manuel

The package imx-seco has been added in the defconfigs.

---
 configs/freescale_imx8qmmek_defconfig  | 9 +++++----
 configs/freescale_imx8qxpmek_defconfig | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)
configs/freescale_imx8qmmek_defconfig +5 -4
index ddc4767e08..e87818f34b 100644
@@ -1,12 +1,12 @@
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qm-mek"
@@ -14,20 +14,21 @@ BR2_PACKAGE_FREESCALE_IMX=y
 BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y
 BR2_PACKAGE_FIRMWARE_IMX=y
 BR2_PACKAGE_IMX_SC_FIRMWARE=y
+BR2_PACKAGE_IMX_SECO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
configs/freescale_imx8qxpmek_defconfig +5 -4
index 82f433f6cf..1965e0c804 100644
@@ -1,14 +1,14 @@
 BR2_aarch64=y
 BR2_cortex_a35=y
 BR2_ARM_FPU_VFPV3=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek"
@@ -16,20 +16,21 @@ BR2_PACKAGE_FREESCALE_IMX=y
 BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y
 BR2_PACKAGE_FIRMWARE_IMX=y
 BR2_PACKAGE_IMX_SC_FIRMWARE=y
+BR2_PACKAGE_IMX_SECO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
Signature · 1 line
2.17.1
#8 lore raw

PATCH 5/5 configs/freescale_imx8q{m, xp}mek: bump BSP components to 4.19.35_1.1.0

Hello,

Quoted 4 lines · On Fri, 20 Mar 2020 17:31:58 +0100 Maeva Manuel <[email protected]>…

The package imx-seco has been added in the defconfigs.

Thanks! However, we still have some NXP platforms that don't use 4.19:

$ grep "LINUX_KERNEL.*4\.14" configs/freescale_*
configs/freescale_imx8mmevk_defconfig:BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
configs/freescale_imx8mqevk_defconfig:BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"

Could you have a look at switching them to 4.19, provided of course you have the HW to test them ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

cover updates of the NXP i.MX8QM/QXP

In reply to Maeva Manuel

Hello,

Quoted 9 lines · On Fri, 20 Mar 2020 17:31:53 +0100 Maeva Manuel <[email protected]>…

The patch queue updates the defconfigs for NXP i.MX8QM and i.MX8QXP to NXP BSP 4.19.35_1.1.0 and the necessary BSP dependancies (imx-seco, firmware-imx, imx-sc-firmware, imx-mkimage).

Maeva Manuel (5):
package/freescale-imx/imx-seco: new package package/freescale-imx/firmware-imx: bump version to 8.5 package/freescale-imx/imx-sc-firmware: bump to version 1.2.7.1 package/imx-mkimage: bump to version rel_imx_4.19.35_1.1.0 configs/freescale_imx8q{m,xp}mek: bump BSP components to 4.19.35_1.1.0

Thanks, I've applied the entire series, but I have a few comments about some of the patches, I'll reply to them individually.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com