| Message ID | 1454154357-31625-2-git-send-email-gary.bisson@boundarydevices.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Gary Bisson, On Sat, 30 Jan 2016 12:45:48 +0100, Gary Bisson wrote: > The package adds the EPDC waveforms and the needed changes to properly > install those were done in the firmware-imx.inc file. I guess you wanted to say firmware-imx.mk. Maybe you've done too much Yocto :-) > define FIRMWARE_IMX_INSTALL_TARGET_CMDS > - mkdir -p $(TARGET_DIR)/lib/firmware > + mkdir -p $(TARGET_DIR)/lib/firmware/imx > for blobdir in $(FIRMWARE_IMX_BLOBS); do \ > cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ > done > + cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx; \ The ; \ is not needed. > + mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ > + $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw; The final is not needed. Also, this rename is a bit weird, maybe a comment would have been good. I've fixed the typos and applied. Thanks! Thomas
Thomas, All, On Mon, Feb 1, 2016 at 9:39 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Dear Gary Bisson, > > On Sat, 30 Jan 2016 12:45:48 +0100, Gary Bisson wrote: > >> The package adds the EPDC waveforms and the needed changes to properly >> install those were done in the firmware-imx.inc file. > > I guess you wanted to say firmware-imx.mk. Maybe you've done too much > Yocto :-) Haha, no trust me I try not to. It's just a bad copy/paste from the Yocto commit log. >> define FIRMWARE_IMX_INSTALL_TARGET_CMDS >> - mkdir -p $(TARGET_DIR)/lib/firmware >> + mkdir -p $(TARGET_DIR)/lib/firmware/imx >> for blobdir in $(FIRMWARE_IMX_BLOBS); do \ >> cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ >> done >> + cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx; \ > > The ; \ is not needed. > >> + mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ >> + $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw; > > The final is not needed. > > Also, this rename is a bit weird, maybe a comment would have been good. I agree, my guess is that the driver is looking for the .fw file but the package includes this strange .nonrestricted extension. So I just copied what was done in the Yocto package. Regards, Gary
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index 0b89c4b..06d5a54 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,2 +1,2 @@ # locally computed -sha256 1f09acd4d605efc78a0672068a658cb16274811d2f444cf3ae7aaa075266746f firmware-imx-3.14.28-1.0.0.bin +sha256 8cc2df128c0e2d2f5224d73389fbe6e4d6fa9ede76f8c0a9adaf7ec0986d0f1f firmware-imx-5.2.bin diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 9cab5c2..51c428f 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION) +FIRMWARE_IMX_VERSION = 5.2 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin @@ -13,17 +13,20 @@ FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ FIRMWARE_IMX_LICENSE_FILES = EULA COPYING FIRMWARE_IMX_REDISTRIBUTE = NO -FIRMWARE_IMX_BLOBS = ath6k sdma vpu +FIRMWARE_IMX_BLOBS = sdma vpu define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef define FIRMWARE_IMX_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware + mkdir -p $(TARGET_DIR)/lib/firmware/imx for blobdir in $(FIRMWARE_IMX_BLOBS); do \ cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ done + cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx; \ + mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ + $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw; endef $(eval $(generic-package))
Use a different versioning schema based on package versioning instead of BSP version. This way, if a new BSP version does not bump this package, we can keep this package unchanged as well. VPU firmware upgraded to v3.1.1_r46067 - Low Latency fixes for H.264 encoder - Wrong frame number fix for H.264 decoder - Decode failure fix for H.264 decoder with multi-SPS/PPS headers The package adds the EPDC waveforms and the needed changes to properly install those were done in the firmware-imx.inc file. This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-fsl-arm/commit/d869826 https://github.com/Freescale/meta-fsl-arm/commit/075a5b1 This package has been implicitely tested through gstreamer as the plugins rely on them for vpu decoding for instance: # gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \ matroskademux ! imxvpudec ! imxipuvideosink Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> --- package/freescale-imx/firmware-imx/firmware-imx.hash | 2 +- package/freescale-imx/firmware-imx/firmware-imx.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)