diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
index af77b394..ce7be5e7 100644
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
 
 PV = "${CNM_WAVE521_FW_VERSION}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 CLEANBROKEN = "1"
 
@@ -18,10 +18,11 @@ COMPATIBLE_MACHINE = "j7"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
-TARGET_WAVE215C = "wave521c_codec_fw.bin"
+TARGET_WAVE521C = "wave521c_codec_fw.bin"
+TARGET_WAVE521C:j721s2-evm = "wave521c_j721s2_codec_fw.bin"
 
-ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE215C}"
-ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE215C}"
+ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE521C}"
+ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}"
 ALTERNATIVE_PRIORITY = "10"
 
 # Set up names for the firmwares
@@ -30,7 +31,7 @@ ALTERNATIVE_${PN}:j7 = "\
 
 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
-	install -m 0644 ${S}/cnm/${TARGET_WAVE215C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE215C}
+	install -m 0644 ${S}/cnm/${TARGET_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}
 }
 
 # make sure that lib/firmware, and all its contents are part of the package