Merge pull request #608 from lumag/fw-sc8180x-upd

Update SC8180X (Asus Primus) firmware

recipes-bsp/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb

@@ -6,10 +6,14 @@ FW_QCOM_SUBDIR = "msm8998/LENOVO/81F1"
 FW_QCOM_NAME = "lenovo-miix-630"
 WOA_SUBDIR = "Lenovo/Miix630"
 
+WOA_CABINETS = " \
+    qcdx8998.cab;name=dx \
+    qcipa8998.cab;name=ipa \
+    qcsubsys8998.cab;name=dsp \
+"
+
 SRC_URI = "\
-    ${WOA_FW_URL}/qcdx8998.cab;name=dx \
-    ${WOA_FW_URL}/qcipa8998.cab;name=ipa \
-    ${WOA_FW_URL}/qcsubsys8998.cab;name=dsp \
+    ${WOA_SRC_URI} \
     file://adspr.jsn \
     file://adspua.jsn \
     file://slpir.jsn \

recipes-bsp/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb

@@ -6,10 +6,14 @@ FW_QCOM_SUBDIR = "sdm850/LENOVO/81JL"
 FW_QCOM_NAME = "lenovo-yoga-c630"
 WOA_SUBDIR = "Lenovo/YogaC630"
 
-SRC_URI = "\
-    ${WOA_FW_URL}/qcdx850.cab;name=dx \
-    ${WOA_FW_URL}/qcipa850.cab;name=ipa \
-    ${WOA_FW_URL}/qcsubsys850.cab;name=dsp \
+WOA_CABINETS = " \
+    qcdx850.cab;name=dx \
+    qcipa850.cab;name=ipa \
+    qcsubsys850.cab;name=dsp \
+"
+
+SRC_URI = " \
+    ${WOA_SRC_URI} \
     file://adspr.jsn \
     file://adspua.jsn \
     file://cdspr.jsn \

recipes-bsp/firmware-woa/firmware-qcom-sc8180x_200.0.108.0.bb

@@ -0,0 +1,44 @@
+DESCRIPTION = "Qualcomm Firmware for Compute SC8180X devices"
+
+LICENSE = "CLOSED"
+
+FW_QCOM_NAME = "sc8180x"
+WOA_SUBDIR = "8180_CLS"
+
+WOA_CABINETS = " \
+    qcdx8180.cab;name=dx \
+    qcipa8180.cab;name=ipa \
+    qcsubsys_ext_adsp8180.cab;name=adsp \
+    qcsubsys_ext_cdsp8180.cab;name=cdsp \
+    qcsubsys_ext_mpss8180.cab;name=mpss \
+    qcsubsys_ext_scss8180.cab;name=slpi \
+"
+
+SRC_URI = " \
+    ${WOA_SRC_URI} \
+    file://adspr.jsn \
+    file://adspua.jsn \
+    file://battmgr.jsn \
+    file://cdspr.jsn \
+    file://slpir.jsn \
+    file://slpius.jsn \
+"
+
+SRC_URI[dx.sha256sum] = "33a582149868d2a4fe3c2cded4dbb05128a29248028961438ae687c2feaa9e63"
+SRC_URI[ipa.sha256sum] = "e083779b7ee99edfd0fc4a54fb562c355476cf359f29cc729052158f97c3769d"
+SRC_URI[adsp.sha256sum] = "a89c65ecebcc17c58851768d69c5d28c7853c207e5cda3cf06f70e2456b1be2c"
+SRC_URI[cdsp.sha256sum] = "cecfcdef349d178c53557dfe2ec00ea33b4573e9ea6934bb44a2b328ee4a2f34"
+SRC_URI[mpss.sha256sum] = "099cd6f74d44de19925bba98f4f8efc2f70cac12aed9335047a8e4611e536761"
+SRC_URI[slpi.sha256sum] = "7f148ef79645612355df415826a5d03aafc6813ce2e06e22b03655a1c84a4b28"
+
+SPLIT_FIRMWARE_PACKAGES = "\
+    linux-firmware-qcom-${FW_QCOM_NAME}-adreno \
+    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
+    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
+    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
+    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
+    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
+    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
+"
+
+require firmware-woa.inc

recipes-bsp/firmware-woa/firmware-woa.inc

@@ -30,3 +30,13 @@ do_install:append() {
 
     install -m 0644 ${UNPACKDIR}/*.jsn ${D}${FW_QCOM_PATH}
 }
+
+# cabinet filenams are neither unique nor contain the version. Construct
+# downloaded file names to solve name conflicts.
+python __anonymous () {
+    urls = []
+    for cab in (d.getVar("WOA_CABINETS") or "").split():
+        name = cab.split(';')[0]
+        urls.append("${WOA_FW_URL}/%s;downloadfilename=${WOA_SUBDIR}/${PV}/%s" % (cab, name))
+    d.setVar("WOA_SRC_URI", " ".join(urls));
+}

recipes-bsp/firmware/firmware-qcom.inc

@@ -21,7 +21,7 @@ RRECOMMENDS:${PN} += "${@ ' '.join(filter(lambda p: not p.endswith('-split'), d.
 # Default settings for several split packages
 FILES:${PN}-dspso += "${FW_QCOM_BASE_PATH}/*/*dspso.bin"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-adreno = "${FW_QCOM_PATH}/*_zap.mbn"
-FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio = "${FW_QCOM_PATH}/adsp.mbn ${FW_QCOM_PATH}/adsp*.jsn"
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio = "${FW_QCOM_PATH}/adsp.mbn ${FW_QCOM_PATH}/adsp*.jsn ${FW_QCOM_PATH}/battmgr.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio-split = "${FW_QCOM_PATH}/adsp.mdt ${FW_QCOM_PATH}/adsp.b*"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-compute = "${FW_QCOM_PATH}/cdsp.mbn ${FW_QCOM_PATH}/cdsp*.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-compute-split = "${FW_QCOM_PATH}/cdsp.mdt ${FW_QCOM_PATH}/cdsp.b*"

recipes-bsp/images/initramfs-firmware-sc8180x-image.bb

@@ -6,10 +6,7 @@ PACKAGE_INSTALL += " \
 
 BAD_RECOMMENDATIONS = " \
     linux-firmware-qca \
-    linux-firmware-ath10k \
     linux-firmware-qcom-sc8180x-compute \
-    linux-firmware-qcom-sc8180x-ipa \
-    linux-firmware-qcom-sc8180x-modem \
     linux-firmware-qcom-sc8180x-sensors \
     linux-firmware-qcom-sc8180x-venus \
 "