All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies
@ 2020-07-16 16:14 Gary Bisson
  2020-07-16 21:08 ` Thomas Petazzoni
  0 siblings, 1 reply; 3+ messages in thread
From: Gary Bisson @ 2020-07-16 16:14 UTC (permalink / raw)
  To: buildroot

In latest patch the SDMA installation was limited to platforms whose
name was mentioned in the binary but this approach wasn't flexible to
manage cases like imx8m using imx7 sdma binary, so this patch does:
- change VPU/SDMA FW options to string to allow specifying the name
  (suggested by Thomas)
- remove imx27 sdma case as non-existent
- add imx8m family support (using imx7d binary)
- get rid of FIRMWARE_IMX_PLATFORM_LOWER macro

Fixes: fad2df39b9 ("package/freescale-imx/firmware-imx: clarify
installation of firmware files")

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 package/freescale-imx/firmware-imx/Config.in  | 34 ++++++++++---------
 .../firmware-imx/firmware-imx.mk              | 17 +++-------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in
index aae552177f..5becf8b6a9 100644
--- a/package/freescale-imx/firmware-imx/Config.in
+++ b/package/freescale-imx/firmware-imx/Config.in
@@ -12,23 +12,25 @@ config BR2_PACKAGE_FIRMWARE_IMX
 
 if BR2_PACKAGE_FIRMWARE_IMX
 
-config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW
-	bool
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
+config BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME
+	string
+	default "imx25" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK
+	default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
+	default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+	default "imx6q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+	default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
+	default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+	default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
+	default "imx7d" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN
 
-config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_VPU_FW
-	bool
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+config BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME
+	string
+	default "imx27" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS
+	default "imx51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
+	default "imx53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+	default "imx6"  if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+	default "imx8"  if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
+	default "imx8"  if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
 
 config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_HDMI_FW
 	bool
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index cd299aad5e..434a4ce1df 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -14,8 +14,6 @@ FIRMWARE_IMX_REDISTRIBUTE = NO
 
 FIRMWARE_IMX_INSTALL_IMAGES = YES
 
-FIRMWARE_IMX_PLATFORM_LOWER = $(shell echo $(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) | tr A-Z a-z | head -c 5)
-
 define FIRMWARE_IMX_EXTRACT_CMDS
 	$(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
 endef
@@ -106,10 +104,10 @@ endif
 # SDMA firmware
 #
 
-ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW),y)
+ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME),)
 define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW
 	mkdir -p $(TARGET_DIR)/lib/firmware/imx/sdma
-	cp -r $(@D)/firmware/sdma/sdma-$(FIRMWARE_IMX_PLATFORM_LOWER)*.bin \
+	cp -r $(@D)/firmware/sdma/sdma-$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME)*.bin \
 	       $(TARGET_DIR)/lib/firmware/imx/sdma/
 endef
 endif
@@ -118,17 +116,10 @@ endif
 # VPU firmware
 #
 
-ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_VPU_FW),y)
-# special case for i.MX8X, which uses the same firmware as i.MX8
-ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
-FIRMWARE_IMX_VPU_PLATFORM = imx8
-else
-FIRMWARE_IMX_VPU_PLATFORM = $(FIRMWARE_IMX_PLATFORM_LOWER)
-endif
-
+ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME),)
 define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW
 	mkdir -p $(TARGET_DIR)/lib/firmware/imx/vpu
-	cp $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_PLATFORM)*.bin \
+	cp $(@D)/firmware/vpu/vpu_fw_$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME)*.bin \
 		$(TARGET_DIR)/lib/firmware/imx/vpu/
 endef
 endif
-- 
2.27.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies
  2020-07-16 16:14 [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies Gary Bisson
@ 2020-07-16 21:08 ` Thomas Petazzoni
  2020-07-17  7:11   ` Gary Bisson
  0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2020-07-16 21:08 UTC (permalink / raw)
  To: buildroot

On Thu, 16 Jul 2020 18:14:13 +0200
Gary Bisson <gary.bisson@boundarydevices.com> wrote:

> In latest patch the SDMA installation was limited to platforms whose
> name was mentioned in the binary but this approach wasn't flexible to
> manage cases like imx8m using imx7 sdma binary, so this patch does:
> - change VPU/SDMA FW options to string to allow specifying the name
>   (suggested by Thomas)
> - remove imx27 sdma case as non-existent
> - add imx8m family support (using imx7d binary)
> - get rid of FIRMWARE_IMX_PLATFORM_LOWER macro
> 
> Fixes: fad2df39b9 ("package/freescale-imx/firmware-imx: clarify
> installation of firmware files")
> 
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

I've applied, but there were some issues. See below.

> -ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW),y)
> +ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME),)

This condition would always be true, because
$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME) will at least always contain
"" as it is a string option.

So, instead, I've done this:

FIRMWARE_IMX_SDMA_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME))

and then used $(FIRMWARE_IMX_SDMA_FW_NAME). Ditto for the VPU case, of
course.

Applied with this fixed. I did a quick test with i.MX6Q, and both the
SDMA and VPU firmware got installed, as expected.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies
  2020-07-16 21:08 ` Thomas Petazzoni
@ 2020-07-17  7:11   ` Gary Bisson
  0 siblings, 0 replies; 3+ messages in thread
From: Gary Bisson @ 2020-07-17  7:11 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Thu, Jul 16, 2020 at 11:08:44PM +0200, Thomas Petazzoni wrote:
> On Thu, 16 Jul 2020 18:14:13 +0200
> Gary Bisson <gary.bisson@boundarydevices.com> wrote:
> 
> > In latest patch the SDMA installation was limited to platforms whose
> > name was mentioned in the binary but this approach wasn't flexible to
> > manage cases like imx8m using imx7 sdma binary, so this patch does:
> > - change VPU/SDMA FW options to string to allow specifying the name
> >   (suggested by Thomas)
> > - remove imx27 sdma case as non-existent
> > - add imx8m family support (using imx7d binary)
> > - get rid of FIRMWARE_IMX_PLATFORM_LOWER macro
> > 
> > Fixes: fad2df39b9 ("package/freescale-imx/firmware-imx: clarify
> > installation of firmware files")
> > 
> > Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> 
> I've applied, but there were some issues. See below.
> 
> > -ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_SDMA_FW),y)
> > +ifneq ($(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME),)
> 
> This condition would always be true, because
> $(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME) will at least always contain
> "" as it is a string option.

Oh I see, thanks for catching this, I obviously tried that patch with
imx8m and saw the copy was ok, but I didn't try the case of a platform
without sdma, sorry.

> So, instead, I've done this:
> 
> FIRMWARE_IMX_SDMA_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME))
> 
> and then used $(FIRMWARE_IMX_SDMA_FW_NAME). Ditto for the VPU case, of
> course.
> 
> Applied with this fixed. I did a quick test with i.MX6Q, and both the
> SDMA and VPU firmware got installed, as expected.

Looks good, thanks!

Gary

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-17  7:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-16 16:14 [Buildroot] [PATCH v2] package/freescale-imx/firmware-imx: refine vpu and sdma copies Gary Bisson
2020-07-16 21:08 ` Thomas Petazzoni
2020-07-17  7:11   ` Gary Bisson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.