From 584c8d32f9e8dccbe8e5ad8f526896c55f389dc2 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 18 Feb 2014 17:30:23 +0100 Subject: [PATCH] meta-digi-arm: replace firmware-mxs for firmware-atheros This package is now used in both ccimx6adpt and ccardimx28js. Signed-off-by: Alex Gonzalez Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccardimx28.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx6.inc | 1 + .../firmware-atheros_unknown.bb} | 4 ++-- .../firmware-unknown/PS_ASIC_class_1.pst | 0 .../firmware-unknown/PS_ASIC_class_2.pst | 0 .../firmware-unknown/RamPatch.txt | 0 .../firmware-unknown/readme.txt | 0 7 files changed, 4 insertions(+), 3 deletions(-) rename meta-digi-arm/recipes-bsp/{firmware-mxs/firmware-mxs_unknown.bb => firmware-atheros/firmware-atheros_unknown.bb} (85%) rename meta-digi-arm/recipes-bsp/{firmware-mxs => firmware-atheros}/firmware-unknown/PS_ASIC_class_1.pst (100%) rename meta-digi-arm/recipes-bsp/{firmware-mxs => firmware-atheros}/firmware-unknown/PS_ASIC_class_2.pst (100%) rename meta-digi-arm/recipes-bsp/{firmware-mxs => firmware-atheros}/firmware-unknown/RamPatch.txt (100%) rename meta-digi-arm/recipes-bsp/{firmware-mxs => firmware-atheros}/firmware-unknown/readme.txt (100%) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index 6a7a8afbe..c80779baa 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -14,7 +14,7 @@ UBOOT_SUFFIX = "sb" WPA_DRIVER = "nl80211" # Firmware -MACHINE_FIRMWARE = "firmware-mxs-ar3k" +MACHINE_FIRMWARE = "firmware-atheros-ar3k" MACHINE_EXTRA_RDEPENDS += "nvram ubootenv update-flash" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 065c4b84c..56540c894 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -14,6 +14,7 @@ UBOOT_SUFFIX = "imx" # Firmware MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q" +MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" MACHINE_EXTRA_RDEPENDS += "e2fsprogs e2fsprogs-mke2fs parted" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" diff --git a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-mxs_unknown.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb similarity index 85% rename from meta-digi-arm/recipes-bsp/firmware-mxs/firmware-mxs_unknown.bb rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb index acd081f9d..20b732c6e 100644 --- a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-mxs_unknown.bb +++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb @@ -1,6 +1,6 @@ # Copyright (C) 2013 Digi International. -SUMMARY = "Firmware files for Digi's MXS based platforms, such as Atheros bluetooth." +SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth." SECTION = "base" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=ef5b088ca04b6f10b1764aa182f4f51d" @@ -29,4 +29,4 @@ PACKAGES += "${PN}-ar3k" FILES_${PN}-ar3k = "/lib/firmware/ar3k/*" -COMPATIBLE_MACHINE = "(mxs)" +COMPATIBLE_MACHINE = "(mxs|mx6)" diff --git a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/PS_ASIC_class_1.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_1.pst similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/PS_ASIC_class_1.pst rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_1.pst diff --git a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/PS_ASIC_class_2.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_2.pst similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/PS_ASIC_class_2.pst rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_2.pst diff --git a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/RamPatch.txt b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/RamPatch.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/RamPatch.txt rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/RamPatch.txt diff --git a/meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/readme.txt b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/readme.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-mxs/firmware-unknown/readme.txt rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/readme.txt