Merge pull request #104 from rdkcentral/develop

Merge develop to main for vendor release v 1.2.6

conf/include/vendor_pkg_versions.inc

@@ -192,11 +192,21 @@ PV_pn-hdmicec-hal-raspberrypi4 = "1.0.0"
 PR_pn-hdmicec-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-hdmicec-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
 
-SRCREV_pn-iarmmgrs-hal-raspberrypi4 = "1.0.1"
+SRCREV_pn-iarmmgrs-hal-raspberrypi4 = "1.0.0"
 PV_pn-iarmmgrs-hal-raspberrypi4 = "2.0.1"
 PR_pn-iarmmgrs-hal-raspberrypi4 = "r0"
 PACKAGE_ARCH_pn-iarmmgrs-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
 
+SRCREV_pn-pwrmgr-hal-raspberrypi4 = "1.1.0"
+PV_pn-pwrmgr-hal-raspberrypi4 = "1.0.0"
+PR_pn-pwrmgr-hal-raspberrypi4 = "r0"
+PACKAGE_ARCH_pn-pwrmgr-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
+
+SRCREV_pn-deepsleepmgr-hal-raspberrypi4 = "1.1.0"
+PV_pn-deepsleepmgr-hal-raspberrypi4 = "1.0.0"
+PR_pn-deepsleepmgr-hal-raspberrypi4 = "r0"
+PACKAGE_ARCH_pn-deepsleepmgr-hal-raspberrypi4 = "${VENDOR_LAYER_EXTENSION}"
+
 SRCREV_pn-mfrlibs-hal-raspberrypi4 = "1.0.2"
 PV_pn-mfrlibs-hal-raspberrypi4 = "1.0.0"
 PR_pn-mfrlibs-hal-raspberrypi4 = "r0"
@@ -206,3 +216,23 @@ SRCREV_pn-sysint-soc = "1.0.2"
 PV_pn-sysint-soc = "1.0.2"
 PR_pn-sysint-soc = "r0"
 PACKAGE_ARCH_pn-sysint-soc = "${VENDOR_LAYER_EXTENSION}"
+
+SRCREV_pn-systemaudioplatform = "1.0.0"
+PV_pn-systemaudioplatform = "1.0.0"
+PR_pn-systemaudioplatform = "r0"
+PACKAGE_ARCH_pn-systemaudioplatform = "${VENDOR_LAYER_EXTENSION}"
+
+SRCREV_pn-audio-service-rpi = "1.0"
+PV_pn-audio-service-rpi = "1.0"
+PR_pn-audio-service-rpi = "r0"
+PACKAGE_ARCH_pn-audio-service-rpi = "${VENDOR_LAYER_EXTENSION}"
+
+SRCREV_pn-gst-drm-plugins-rpi = "1.0"
+PV_pn-gst-drm-plugins-rpi = "1.0"
+PR_pn-gst-drm-plugins-rpi = "r0"
+PACKAGE_ARCH_pn-gst-drm-plugins-rpi = "${VENDOR_LAYER_EXTENSION}"
+
+SRCREV_pn-secapi2-adapter-rpi  = "1.0"
+PV_pn-secapi2-adapter-rpi  = "1.0"
+PR_pn-secapi2-adapter-rpi  = "r0"
+PACKAGE_ARCH_pn-secapi2-adapter-rpi  = "${VENDOR_LAYER_EXTENSION}"

recipes-core/packagegroups/packagegroup-hal-raspberrypi4.bb

@@ -13,6 +13,11 @@ RDEPENDS_${PN} = " \
     devicesettings-hal-raspberrypi4 \
     hdmicec-hal-raspberrypi4 \
     iarmmgrs-hal-raspberrypi4 \
+    pwrmgr-hal-raspberrypi4 \
+    deepsleepmgr-hal-raspberrypi4 \
     mfrlibs-hal-raspberrypi4 \
+    audio-service-rpi \
+    gst-drm-plugins-rpi \
+    secapi2-adapter-rpi  \
     "
 

recipes-core/packagegroups/packagegroup-vendor-layer.bb

@@ -8,12 +8,13 @@ inherit packagegroup
 
 DEPENDS = " virtual/kernel make-mod-scripts"
 
-PV = "1.2.5"
+PV = "1.2.6"
 PR = "r0"
 
 RDEPENDS_${PN} = " \
         pi-bluetooth \
         sysint-soc \
+        systemaudioplatform \
         virtual/vendor-westeros-soc \
         virtual/vendor-westeros-sink \
         "

recipes-halif/deepsleepmgr/deepsleepmgr-hal-raspberrypi4.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "deepsleep HAL Implementation."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
+
+PROVIDES = "virtual/deepsleep-hal virtual/vendor-deepsleep-hal"
+RPROVIDES_${PN} += " virtual/vendor-deepsleepmgr-hal "
+
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-deepsleep-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "iarmbus-headers deepsleep-manager-headers"
+
+inherit autotools coverity
+
+CFLAGS += " \
+    -I${STAGING_DIR_TARGET}${includedir}/rdk/halif/deepsleep-manager/ \
+    "

recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb

@@ -1,32 +1,18 @@
-DESCRIPTION = "IARMMGRS HAL Implementation - IR, Power & Deepsleep."
+DESCRIPTION = "IARMMGRS HAL Implementation - IR"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
 
 PROVIDES = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal"
 RPROVIDES_${PN} = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal"
 
-# TODO: Move to respective recipe when available
-PROVIDES += " virtual/vendor-pwrmgr-hal virtual/vendor-deepsleepmgr-hal "
-RPROVIDES_${PN} += " virtual/vendor-pwrmgr-hal virtual/vendor-deepsleepmgr-hal "
-
-# Future: RDK-48312 says IARMMGRS HAL will be split into Power & DeepSleep.
-# Rename this recipe as Power Manager HAL when this happens and introduce another for DeepSleep.
-# IR Manager will get deprecated and replaced by udev or similar.
-# Till then this will provide HAL implementation for all 3; IR, Power & DeepSleep.
-
-SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-power-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-ir-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "iarmmgrs-hal-headers iarmbus-headers power-manager-headers deepsleep-manager-headers"
+DEPENDS = "iarmmgrs-hal-headers iarmbus-headers"
 
 inherit autotools coverity
 
 CFLAGS += " \
-    -I${STAGING_DIR_TARGET}${includedir}/rdk/halif/power-manager/ \
-    -I${STAGING_DIR_TARGET}${includedir}/rdk/halif/deepsleep-manager/ \
     -I${STAGING_DIR_TARGET}${includedir}/rdk/iarmmgrs-hal/ \
     "
-
-EXTRA_OECONF += "--enable-dsleep"
-

recipes-halif/pwrmgr/pwrmgr-hal-raspberrypi4.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "PWRMGR HAL Implementation."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
+
+PROVIDES += " virtual/vendor-pwrmgr-hal "
+RPROVIDES_${PN} += " virtual/vendor-pwrmgr-hal"
+
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-power-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "iarmbus-headers power-manager-headers"
+
+inherit autotools coverity
+
+CFLAGS += " \
+    -I${STAGING_DIR_TARGET}${includedir}/rdk/halif/power-manager/ \
+    "

recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bbappend

@@ -0,0 +1,17 @@
+do_install_append() {
+    rm -rf ${D}${nonarch_base_libdir}
+    install -d ${D}${sysconfdir}/firmware/brcm
+
+    cp LICENCE.cypress-rpidistro ${D}${sysconfdir}/firmware
+    install -m 0644 broadcom/BCM434*.hcd ${D}${sysconfdir}/firmware/brcm/
+}
+
+FILES_${PN}-cypress-license = "\
+    ${sysconfdir}/firmware/LICENCE.cypress-rpidistro \
+"
+FILES_${PN}-bcm43430a1-hcd = "\
+    ${sysconfdir}/firmware/brcm/BCM43430A1.hcd \
+"
+FILES_${PN}-bcm4345c0-hcd = "\
+    ${sysconfdir}/firmware/brcm/BCM4345C0.hcd \
+"

recipes-noop/halservices/audio-service-rpi.bb

@@ -0,0 +1,14 @@
+SUMMARY = "No Operation Recipe for audioserver"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${MANIFEST_PATH_PLATFORM}/LICENSE;md5=5bfad6e034e497ee148eec56e175c6e8"
+
+PROVIDES = "virtual/audio-service virtual/vendor-audio-service"
+RPROVIDES:${PN} = "virtual/audio-service virtual/vendor-audio-service"
+
+ALLOW_EMPTY:${PN} = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+
+FILES_${PN} = ""

recipes-noop/halservices/gst-drm-plugins-rpi.bb

@@ -0,0 +1,14 @@
+SUMMARY = "No Operation Recipe for gstreamer drm plugins"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${MANIFEST_PATH_PLATFORM}/LICENSE;md5=5bfad6e034e497ee148eec56e175c6e8"
+
+PROVIDES = "virtual/gst-drm-plugins virtual/vendor-gst-drm-plugins"
+RPROVIDES:${PN} = "virtual/gst-drm-plugins virtual/vendor-gst-drm-plugins"
+
+ALLOW_EMPTY:${PN} = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+
+FILES_${PN} = ""

recipes-noop/halservices/secapi2-adapter-rpi.bb

@@ -0,0 +1,14 @@
+SUMMARY = "No Operation Recipe for secapi adapter version 2.0"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${MANIFEST_PATH_PLATFORM}/LICENSE;md5=5bfad6e034e497ee148eec56e175c6e8"
+
+PROVIDES = "virtual/secapi2-adapter virtual/vendor-secapi2-adapter"
+RPROVIDES:${PN} = "virtual/secapi2-adapter virtual/vendor-secapi2-adapter"
+
+ALLOW_EMPTY:${PN} = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+
+FILES_${PN} = ""

recipes-soc/systemaudioplatform/systemaudioplatform_git.bb

@@ -0,0 +1,13 @@
+SUMMARY = "System Audio platform specific code"
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer1', 'gstreamer1.0  gstreamer1.0-plugins-base', 'gstreamer gst-plugins-base', d)}"
+SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-systemaudioplatform-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
+
+S = "${WORKDIR}/git/systemaudioplatform/"
+inherit cmake pkgconfig
+
+FILES_${PN} = "/usr/lib/libsystemaudioplatform.so.*"
+FILES_${PN}-dev = "/usr/lib/libsystemaudioplatform.so /usr/include/systemaudioplatform.h"