From 0f56eab0523623147b2b94f86ed7ddc1e1846e0e Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 17 Oct 2023 08:31:25 +0200 Subject: [PATCH] rename firmware-murata to firmware-murata-infineon Murata provides this FW recipe for the infineon chip on the ccmpx products. Now we are going to have more FW provided by Murata, but for other chips which recipe is completely different. Therefore, rename the recipe to explicitily indicate the FW it provides. https://onedigi.atlassian.net/browse/DEL-8458 Signed-off-by: Isaac Hermida --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 +- .../firmware-murata-infineon.bb} | 4 ++-- .../cyfmac4373-sdio_US.clm_blob | Bin 4 files changed, 4 insertions(+), 4 deletions(-) rename meta-digi-arm/recipes-bsp/{firmware-murata/firmware-murata.bb => firmware-murata-infineon/firmware-murata-infineon.bb} (96%) rename meta-digi-arm/recipes-bsp/{firmware-murata/firmware-murata => firmware-murata-infineon/firmware-murata-infineon}/cyfmac4373-sdio_US.clm_blob (100%) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index a9ae07f8d..54fabbc80 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -60,7 +60,7 @@ MACHINE_FEATURES += "wifi" # ========================================================================= # Firmware # ========================================================================= -MACHINE_FIRMWARE:append = " firmware-murata firmware-murata-mfgtest" +MACHINE_FIRMWARE:append = " firmware-murata-infineon firmware-murata-infineon-mfgtest" MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index a4bf1d40b..bf6b83680 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -68,7 +68,7 @@ MACHINE_FEATURES += "gpu" # ========================================================================= # Firmware # ========================================================================= -MACHINE_FIRMWARE:append = " firmware-murata firmware-murata-mfgtest" +MACHINE_FIRMWARE:append = " firmware-murata-infineon firmware-murata-infineon-mfgtest" MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ diff --git a/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb similarity index 96% rename from meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb rename to meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb index 168b12219..3d44a8620 100644 --- a/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata.bb +++ b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb @@ -1,6 +1,6 @@ # Copyright (C) 2022,2023 Digi International. -SUMMARY = "Murata firmware binaries" +SUMMARY = "Murata Infineon firmware binaries" SECTION = "base" LICENSE = "CYPRESS-EULA" LIC_FILES_CHKSUM = "file://${S}/cyw-bt-patch/LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7" @@ -27,7 +27,7 @@ S = "${WORKDIR}" DEPENDS = "libnl" do_install () { - bbnote "Installing Murata firmware binaries: " + bbnote "Installing Murata Infineon firmware binaries: " install -d ${D}${base_libdir}/firmware/cypress install -d ${D}${base_libdir}/firmware/brcm install -d ${D}${sbindir} diff --git a/meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata/cyfmac4373-sdio_US.clm_blob b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyfmac4373-sdio_US.clm_blob similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-murata/firmware-murata/cyfmac4373-sdio_US.clm_blob rename to meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyfmac4373-sdio_US.clm_blob