Merge e116dc33 on remote branch

Change-Id: I7d4d61c002697185a5ced5a3c8023e209eef4b00

recipes-products/images/machine-concam-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-wlan-image.inc
\ No newline at end of file

recipes-products/images/machine-drone-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-wlan-image.inc
-

recipes-products/images/machine-image.bbappend

-# Additional non-open source packages to be put to the root filesystem.
-# If product is specified try to include product inc otherwise include base inc.
-include ${@get_bblayer_img_inc('wlan', d)}

recipes-products/images/machine-minimal-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-wlan-image.inc

recipes-products/images/machine-psm-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-wlan-image.inc
-PACKAGE_EXCLUDE:append:mdm9607 = " qcacld-hl wpa-supplicant-qcacld hostap-daemon-qcacld"

recipes-products/images/machine-qsap-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-qsap-wlan-image.inc
\ No newline at end of file

recipes-products/images/machine-robot-image.bbappend

-# wlan open source Packages
-include ${BASEMACHINE}/${BASEMACHINE}-robot-wlan-image.inc

recipes/wlan/qcacld32-ll-hsp_git.bb

@@ -14,10 +14,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/${LICENSE};md5
 PR = "r8"
 _MODNAME = "qca6490"
 FW_PATH_NAME = "qca6490"
-FILES:${PN}     += "${base_libdir}/firmware/wlan/*"
-FILES:${PN}     += "${base_libdir}/firmware/*"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/${_MODNAME}.ko"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/"
+FILES:${PN}     += "${nonarch_base_libdir}/firmware/wlan/*"
+FILES:${PN}     += "${nonarch_base_libdir}/firmware/*"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/${_MODNAME}.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/"
 PROVIDES_NAME   = "kernel-module-${_MODNAME}"
 RPROVIDES:${PN} += "${PROVIDES_NAME}-${KERNEL_VERSION}"
 
@@ -200,6 +200,7 @@ _WLAN_CFG_OVERRIDE_525 = "\
 						CONFIG_WLAN_CFR_ADRASTEA=n \
 						CONFIG_ENABLE_VALLOC_REPLACE_MALLOC=y \
 						CONFIG_MDM_PLATFORM=y \
+						CONFIG_SHUTDOWN_WLAN_IN_SYSTEM_SUSPEND=y \
 						"
 
 EXTRA_OEMAKE:append:sa515m = " WLAN_CFG_OVERRIDE=${_WLAN_CFG_OVERRIDE_515}"

recipes/wlan/qcacld32-ll-rome_git.bb

@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/${LICENSE};md5
 
 _MODNAME = "qca6574"
 FW_PATH_NAME = "qca6174"
-FILES:${PN}     += "${base_libdir}/firmware/wlan/*"
-FILES:${PN}     += "${base_libdir}/firmware/*"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/${_MODNAME}.ko"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/*"
+FILES:${PN}     += "${nonarch_base_libdir}/firmware/wlan/*"
+FILES:${PN}     += "${nonarch_base_libdir}/firmware/*"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/${_MODNAME}.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/*"
 PROVIDES_NAME   = "kernel-module-${_MODNAME}"
 RPROVIDES:${PN} += "${PROVIDES_NAME}-${KERNEL_VERSION}"
 

recipes/wlan/wlan-platform-dlkm_git.bb

@@ -7,12 +7,12 @@ LICENSE = "${@bb.utils.contains('LAYERSERIES_COMPAT_core', 'dunfell',\
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/${LICENSE};md5=801f80980d171dd6425610833a22dbe6"
 SUMMARY = "Wlan platform drivers"
 _MODNAME = "wlan-platform-dlkm"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/cnss2.ko"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/cnss_nl.ko"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/cnss_utils.ko"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/wlan_firmware_service.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/cnss2.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/cnss_nl.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/cnss_utils.ko"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/wlan_firmware_service.ko"
 FILES:${PN}     += "${includedir}/*"
-FILES:${PN}     += "${base_libdir}/modules/${KERNEL_VERSION}/extra/*"
+FILES:${PN}     += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/*"
 PROVIDES_NAME   = "kernel-module-${_MODNAME}"
 RPROVIDES:${PN} += "${PROVIDES_NAME}-${KERNEL_VERSION}"
 RPROVIDES:${PN} += "kernel-module-cnss2-${KERNEL_VERSION}"