package/freescale-imx/firmware-imx: refine vpu and sdma copies
PATCH v2 1/1 package/freescale-imx/firmware-imx: refine vpu and sdma copies
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
installation of firmware files")
--- package/freescale-imx/firmware-imx/Config.in | 34 ++++++++++--------- .../firmware-imx/firmware-imx.mk | 17 +++------- 2 files changed, 22 insertions(+), 29 deletions(-)
package/freescale-imx/firmware-imx/Config.in +18 -16
@@ -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
package/freescale-imx/firmware-imx/firmware-imx.mk +4 -13
@@ -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
Signature · 1 line
2.27.0
PATCH v2 1/1 package/freescale-imx/firmware-imx: refine vpu and sdma copies
Quoted 9 lines · On Thu, 16 Jul 2020 18:14:13 +0200 Gary Bisson…
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 ofFIRMWARE_IMX_PLATFORM_LOWERmacro
Quoted 4 lines
Fixes fad2df39b9 ("package/freescale-imx/firmware-imx: clarifyinstallation of firmware files")
Signed-off-by Gary Bisson <[email protected]>
I've applied, but there were some issues. See below.
package/freescale-imx/firmware-imx/firmware-imx.mk endif · line 107
Quoted 2 lines
package/freescale-imx/firmware-imx/firmware-imx.mk +1
-1-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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/freescale-imx/firmware-imx: refine vpu and sdma copies
Hi Thomas,
Quoted 17 lines · Thomas Petazzoni
Quoted 9 lines · On Thu, 16 Jul 2020 18:14:13 +0200 Gary Bisson…
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 ofFIRMWARE_IMX_PLATFORM_LOWERmacroQuoted 4 lines
Fixes fad2df39b9 ("package/freescale-imx/firmware-imx: clarifyinstallation of firmware files")
Signed-off-by Gary Bisson <[email protected]>
Quoted 8 lines
I've applied, but there were some issues. See below.
package/freescale-imx/firmware-imx/firmware-imx.mk endif · line 107
Quoted 2 lines
package/freescale-imx/firmware-imx/firmware-imx.mk +1
-1-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.
Quoted 9 lines
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