All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-fsl-arm][PATCH 0/2] Add firmware for WiFi and Bluetooth
@ 2016-08-10 20:18 Daiane Angolini
  2016-08-10 20:18 ` [PATCH] firmware-imx: " Daiane Angolini
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Daiane Angolini @ 2016-08-10 20:18 UTC (permalink / raw)
  To: meta-freescale

Please, find the patchset for the proposal of recipe rework to include the
installation of a BCM4339/TypeZP firmware.

While on this, I have reworked the recipe to use {base_libdir} instead of
the path "lib/". 

Please, review and comment if there is a better way to implement this.

*** BLURB HERE ***

Daiane Angolini (2):
  firmware-imx: Rework recipe to use base_libdir
  firmware-imx: Add firmware for WiFi and Bluetooth

 recipes-bsp/firmware-imx/firmware-imx.inc    | 32 +++++++++++++++++-----------
 recipes-bsp/firmware-imx/firmware-imx_5.4.bb |  4 ++++
 2 files changed, 24 insertions(+), 12 deletions(-)

-- 
2.7.4



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] firmware-imx: Add firmware for WiFi and Bluetooth
  2016-08-10 20:18 [meta-fsl-arm][PATCH 0/2] Add firmware for WiFi and Bluetooth Daiane Angolini
@ 2016-08-10 20:18 ` Daiane Angolini
  2016-08-10 20:27   ` Otavio Salvador
  2016-08-10 20:18 ` [meta-fsl-arm][PATCH 1/2] firmware-imx: Rework recipe to use base_libdir Daiane Angolini
  2016-08-10 20:18 ` [meta-fsl-arm][PATCH 2/2] firmware-imx: Add firmware for WiFi and Bluetooth Daiane Angolini
  2 siblings, 1 reply; 6+ messages in thread
From: Daiane Angolini @ 2016-08-10 20:18 UTC (permalink / raw)
  To: meta-freescale

Add firmware for BCM4339/TypeZP and include a new sub-package firmware-imx-bcm4339

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc    | 11 +++++++++--
 recipes-bsp/firmware-imx/firmware-imx_5.4.bb |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 558f7fb..290a241 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -6,13 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 
 PE = "1"
 
-SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git"
 
 inherit fsl-eula-unpack
 
 do_install() {
     install -d ${D}/lib/firmware/imx
+    install -d ${D}/lib/firmware/bcm
     cp -rfv firmware/* ${D}/lib/firmware/
+    cp -rfv git/BCM4339/TypeZP/BCM4339_wifi/*.bin ${D}/lib/firmware/bcm
+    cp -rfv git/BCM4339/TypeZP/BCM4339_BT/*.hcd ${D}/lib/firmware/
 
     mv ${D}/lib/firmware/epdc/ ${D}/lib/firmware/imx/epdc/
     mv ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
@@ -38,14 +42,17 @@ python populate_packages_prepend() {
                       description='Freescale IMX Firmware %s',
                       extra_depends='',
                       prepend=True)
+
 }
 
 ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
-PACKAGES =+ "${PN}-epdc"
+PACKAGES =+ "${PN}-epdc ${PN}-bcm4339"
 
 FILES_${PN}-epdc = "/lib/firmware/imx/epdc/"
+FILES_${PN}-bcm4339 = "/lib/firmware/*.hcd /lib/firmware/bcm/*"
+
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
index a7a2b38..9ea6825 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
@@ -6,4 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 SRC_URI[md5sum] = "dae846ca2fc4504067f725f501491adf"
 SRC_URI[sha256sum] = "c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223"
 
+#BCMDHD firmware git
+SRCBRANCH = "pico-brillo-20160727"
+SRCREV = "43627cc213d5192293637933de3aecf1f51b1c22"
+
 COMPATIBLE_MACHINE = "(mx5|mx6|mx6ul|mx7)"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [meta-fsl-arm][PATCH 1/2] firmware-imx: Rework recipe to use base_libdir
  2016-08-10 20:18 [meta-fsl-arm][PATCH 0/2] Add firmware for WiFi and Bluetooth Daiane Angolini
  2016-08-10 20:18 ` [PATCH] firmware-imx: " Daiane Angolini
@ 2016-08-10 20:18 ` Daiane Angolini
  2016-08-10 20:18 ` [meta-fsl-arm][PATCH 2/2] firmware-imx: Add firmware for WiFi and Bluetooth Daiane Angolini
  2 siblings, 0 replies; 6+ messages in thread
From: Daiane Angolini @ 2016-08-10 20:18 UTC (permalink / raw)
  To: meta-freescale

Rework recipe to use ${base_libdir} instead of pointing direct to the "lib/" path.

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 558f7fb..3aa99a6 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -11,28 +11,28 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 inherit fsl-eula-unpack
 
 do_install() {
-    install -d ${D}/lib/firmware/imx
-    cp -rfv firmware/* ${D}/lib/firmware/
+    install -d ${D}${base_libdir}/firmware/imx
+    cp -rfv firmware/* ${D}${base_libdir}/firmware/
 
-    mv ${D}/lib/firmware/epdc/ ${D}/lib/firmware/imx/epdc/
-    mv ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
+    mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
+    mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
 
-    find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';'
-    find ${D}/lib/firmware -type f -exec chown root:root '{}' ';'
+    find ${D}${base_libdir}/firmware -type f -exec chmod 644 '{}' ';'
+    find ${D}${base_libdir}/firmware -type f -exec chown root:root '{}' ';'
 
     # Remove files not going to be installed
-    find ${D}/lib/firmware/ -name '*.mk' -exec rm '{}' ';'
+    find ${D}${base_libdir}/firmware/ -name '*.mk' -exec rm '{}' ';'
 }
 
 python populate_packages_prepend() {
-    vpudir = bb.data.expand('/lib/firmware/vpu', d)
+    vpudir = bb.data.expand('${base_libdir}/firmware/vpu', d)
     do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
                       output_pattern='firmware-imx-vpu-%s',
                       description='Freescale IMX Firmware %s',
                       extra_depends='',
                       prepend=True)
 
-    sdmadir = bb.data.expand('/lib/firmware/sdma', d)
+    sdmadir = bb.data.expand('${base_libdir}/firmware/sdma', d)
     do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
                       output_pattern='firmware-imx-sdma-%s',
                       description='Freescale IMX Firmware %s',
@@ -46,6 +46,6 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
 PACKAGES =+ "${PN}-epdc"
 
-FILES_${PN}-epdc = "/lib/firmware/imx/epdc/"
+FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [meta-fsl-arm][PATCH 2/2] firmware-imx: Add firmware for WiFi and Bluetooth
  2016-08-10 20:18 [meta-fsl-arm][PATCH 0/2] Add firmware for WiFi and Bluetooth Daiane Angolini
  2016-08-10 20:18 ` [PATCH] firmware-imx: " Daiane Angolini
  2016-08-10 20:18 ` [meta-fsl-arm][PATCH 1/2] firmware-imx: Rework recipe to use base_libdir Daiane Angolini
@ 2016-08-10 20:18 ` Daiane Angolini
  2 siblings, 0 replies; 6+ messages in thread
From: Daiane Angolini @ 2016-08-10 20:18 UTC (permalink / raw)
  To: meta-freescale

Add firmware for BCM4339/TypeZP and include a new sub-package:

  firmware-imx-bcm4339

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc    | 12 ++++++++++--
 recipes-bsp/firmware-imx/firmware-imx_5.4.bb |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 3aa99a6..c8b0ff9 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -6,13 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 
 PE = "1"
 
-SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git"
 
 inherit fsl-eula-unpack
 
 do_install() {
     install -d ${D}${base_libdir}/firmware/imx
+    install -d ${D}${base_libdir}/firmware/bcm
+
+    cp -rfv firmware/* ${D}${base_libdir}/firmware/
     cp -rfv firmware/* ${D}${base_libdir}/firmware/
+    cp -rfv git/BCM4339/TypeZP/BCM4339_wifi/*.bin ${D}${base_libdir}/firmware/bcm
+    cp -rfv git/BCM4339/TypeZP/BCM4339_BT/*.hcd ${D}${base_libdir}/firmware/
 
     mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
     mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
@@ -38,14 +44,16 @@ python populate_packages_prepend() {
                       description='Freescale IMX Firmware %s',
                       extra_depends='',
                       prepend=True)
+
 }
 
 ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
-PACKAGES =+ "${PN}-epdc"
+PACKAGES =+ "${PN}-epdc ${PN}-bcm4339"
 
 FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
+FILES_${PN}-bcm4339 = "${base_libdir}/firmware/*.hcd ${base_libdir}/firmware/bcm/*"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
index a7a2b38..edfbc6e 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
@@ -6,4 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 SRC_URI[md5sum] = "dae846ca2fc4504067f725f501491adf"
 SRC_URI[sha256sum] = "c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223"
 
+#BCM4339/TypeZP firmware git
+SRCBRANCH = "pico-brillo-20160727"
+SRCREV = "43627cc213d5192293637933de3aecf1f51b1c22"
+
 COMPATIBLE_MACHINE = "(mx5|mx6|mx6ul|mx7)"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] firmware-imx: Add firmware for WiFi and Bluetooth
  2016-08-10 20:18 ` [PATCH] firmware-imx: " Daiane Angolini
@ 2016-08-10 20:27   ` Otavio Salvador
  2016-08-10 20:36     ` Daiane Angolini
  0 siblings, 1 reply; 6+ messages in thread
From: Otavio Salvador @ 2016-08-10 20:27 UTC (permalink / raw)
  To: Daiane Angolini; +Cc: meta-freescale@yoctoproject.org

On Wed, Aug 10, 2016 at 5:18 PM, Daiane Angolini
<daiane.angolini@nxp.com> wrote:
> Add firmware for BCM4339/TypeZP and include a new sub-package firmware-imx-bcm4339
>
> Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>

The patch looks good; the only remark is about the /lib use. Please see below.

> ---
>  recipes-bsp/firmware-imx/firmware-imx.inc    | 11 +++++++++--
>  recipes-bsp/firmware-imx/firmware-imx_5.4.bb |  4 ++++
>  2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
> index 558f7fb..290a241 100644
> --- a/recipes-bsp/firmware-imx/firmware-imx.inc
> +++ b/recipes-bsp/firmware-imx/firmware-imx.inc
> @@ -6,13 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
>
>  PE = "1"
>
> -SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
> +SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
> +           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git"
>
>  inherit fsl-eula-unpack
>
>  do_install() {
>      install -d ${D}/lib/firmware/imx
> +    install -d ${D}/lib/firmware/bcm
>      cp -rfv firmware/* ${D}/lib/firmware/
> +    cp -rfv git/BCM4339/TypeZP/BCM4339_wifi/*.bin ${D}/lib/firmware/bcm
> +    cp -rfv git/BCM4339/TypeZP/BCM4339_BT/*.hcd ${D}/lib/firmware/

Please before adding those, do you mind to rework the recipe and avoid
using /lib explicitly? We ought to use ${base_libdir} instead.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] firmware-imx: Add firmware for WiFi and Bluetooth
  2016-08-10 20:27   ` Otavio Salvador
@ 2016-08-10 20:36     ` Daiane Angolini
  0 siblings, 0 replies; 6+ messages in thread
From: Daiane Angolini @ 2016-08-10 20:36 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: meta-freescale@yoctoproject.org

On Wed, Aug 10, 2016 at 5:27 PM, Otavio Salvador
<otavio.salvador@ossystems.com.br> wrote:

>>  do_install() {
>>      install -d ${D}/lib/firmware/imx
>> +    install -d ${D}/lib/firmware/bcm
>>      cp -rfv firmware/* ${D}/lib/firmware/
>> +    cp -rfv git/BCM4339/TypeZP/BCM4339_wifi/*.bin ${D}/lib/firmware/bcm
>> +    cp -rfv git/BCM4339/TypeZP/BCM4339_BT/*.hcd ${D}/lib/firmware/
>
> Please before adding those, do you mind to rework the recipe and avoid
> using /lib explicitly? We ought to use ${base_libdir} instead.

I should have made a mistake with the patch files. I just sent v2.

Thanks a lot, Otavio, for your help on this patch

Daiane


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-08-10 20:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-10 20:18 [meta-fsl-arm][PATCH 0/2] Add firmware for WiFi and Bluetooth Daiane Angolini
2016-08-10 20:18 ` [PATCH] firmware-imx: " Daiane Angolini
2016-08-10 20:27   ` Otavio Salvador
2016-08-10 20:36     ` Daiane Angolini
2016-08-10 20:18 ` [meta-fsl-arm][PATCH 1/2] firmware-imx: Rework recipe to use base_libdir Daiane Angolini
2016-08-10 20:18 ` [meta-fsl-arm][PATCH 2/2] firmware-imx: Add firmware for WiFi and Bluetooth Daiane Angolini

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.