From 76596391c353317175e5cf7b2830869096827f2a Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Wed, 17 Aug 2016 16:12:48 -0300 Subject: Revert "firmware-imx: Add firmware for WiFi and Bluetooth" This reverts commit e4a93c79de6aae56182c63c6223c19e01bdfeb42. The git repository pointed in the commit is not part of any NXP release so it is not tested. Signed-off-by: Daiane Angolini Signed-off-by: Otavio Salvador --- recipes-bsp/firmware-imx/firmware-imx.inc | 12 ++---------- recipes-bsp/firmware-imx/firmware-imx_5.4.bb | 4 ---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc index c8b0ff9..3aa99a6 100644 --- a/recipes-bsp/firmware-imx/firmware-imx.inc +++ b/recipes-bsp/firmware-imx/firmware-imx.inc @@ -6,19 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a" PE = "1" -SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ - git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git" +SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true" 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 @@ -44,16 +38,14 @@ 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 ${PN}-bcm4339" +PACKAGES =+ "${PN}-epdc" 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 edfbc6e..a7a2b38 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb @@ -6,8 +6,4 @@ 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)" -- cgit v1.2.3-54-g00ecf