From 14a7d127f02aed34d13b409c7227c92b8d66bb74 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 29 May 2017 11:26:26 +0200 Subject: [PATCH] meta-digi-arm: Remove worldwide board data file. https://jira.digi.com/browse/DEL-4291 Signed-off-by: Alex Gonzalez --- .../firmware-qualcomm/firmware-qualcomm.bb | 2 -- .../firmware-qualcomm/bdwlan30_World.bin | Bin 8124 -> 0 bytes .../kernel-module-qualcomm/qualcomm-pre-up | 9 +++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb index 6bf486f38..5522fd5fe 100644 --- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb +++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb @@ -14,7 +14,6 @@ FW_QCA6564-BT = " \ FW_QCA6564-WIFI = " \ file://bdwlan30_US.bin \ - file://bdwlan30_World.bin \ file://LICENCE.atheros_firmware \ file://otp30.bin \ file://qwlan30.bin \ @@ -42,7 +41,6 @@ do_install() { install -d ${D}${base_libdir}/firmware install -m 0644 \ bdwlan30_US.bin \ - bdwlan30_World.bin \ LICENCE.atheros_firmware \ otp30.bin \ qwlan30.bin \ diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin deleted file mode 100644 index 65f13b87e849d341f50e13b29bb34c3f891480f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8124 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 E1J3n{LI3~& diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up index 89efc7e75..3c1cccdeb 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up @@ -78,8 +78,13 @@ case "${REGULATORY_DOMAIN}" in ${US_CODE}) logger -t qca6564 "Setting US wireless region";; ${WW_CODE}|${JP_CODE}) - logger -t qca6564 "Setting WW (world wide) wireless region" - BDATA_SOURCE="${FIRMWARE_DIR}/bdwlan30_World.bin";; + if [ -e "${FIRMWARE_DIR}/bdwlan30_World.bin" ]; then + logger -t qca6564 "Setting WW (world wide) wireless region" + BDATA_SOURCE="${FIRMWARE_DIR}/bdwlan30_World.bin" + else + logger -t qca6564 "[WARN] No WW (worldwide) board data file, using US" + fi + ;; "") logger -t qca6564 "[WARN] region code not found, using US";; *)