uhd-firmware: update to 3.3.1

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 8 insertions, 14 deletions

diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb
deleted file mode 100644
index 0c70e19c6..000000000
--- a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.002.001.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require uhd-firmware.inc
-LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=ea9a4b4421aeeca7c864fd8ca6dd73dd"
-
-PV = "003_002_001"
-PVdots = "003.002.001"
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "1894391da027884e5eed474606250be9"
-SRC_URI[sha256sum] = "c194d9e30bb02225de623400bdba9be9200f70a57c6220506bc0b051eed8fae8"
-
diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
index 24dfae40f..97dab1c46 100644
--- a/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.003.001.bb
@@ -1,14 +1,18 @@
 DESCRIPTION = "Universal Hardware Driver Firmware"
 HOMEPAGE = "http://www.ettus.com"
-LICENSE = "GPLv3"
 
-INC_PR = "r0"
+PE = "1"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://share/uhd/images/usrp_e100_fpga_v2.bin;md5=52f5a4b60aca734da1b0e78078aeea71"
 
 inherit allarch
 
-SRC_URI = "http://www.ettus.com/downloads/uhd_releases/${PV}/images-only/UHD-images-${PVdots}.tar.gz"
+SRC_URI = "http://www.ettus.com/downloads/uhd_releases/${@'${PV}'.replace('.', '_')}/images-only/UHD-images-${PV}.tar.gz"
+SRC_URI[md5sum] = "84ec78ec03699a96d64210b93019f782"
+SRC_URI[sha256sum] = "53712db43b324adad1b83617f99f7b73682bcd0078bbc9915d0a376f4ca41289"
 
-S = "${WORKDIR}/UHD-images-${PVdots}"
+S = "${WORKDIR}/UHD-images-${PV}-59f407f"
 
 do_install() {
         install -d ${D}${datadir}/uhd/images