From ca3d780228de9178df09eb3c9118f376cc27d9c4 Mon Sep 17 00:00:00 2001 From: Manigandan Gopalakrishnan Date: Fri, 14 Nov 2025 22:57:43 +0530 Subject: [PATCH] RDKBACCL-1234: Making meta-rdk-broadband-apps part of BPI builds Reason for change: Including meta-rdk-broadband-apps in yocto BPI build Test procedure: Testing BB apps Risks: Low Signed-off-by: Manigandan Gopalakrishnan --- conf/distro/include/rdk-bpi.inc | 3 --- conf/include/rdk-bpi-bbmasks.inc | 1 + .../recipes-kernel/linux/linux-mediatek_%.bbappend | 4 ++-- meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend | 1 + setup-environment-refboard-rdkb | 6 ++++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/rdk-bpi.inc b/conf/distro/include/rdk-bpi.inc index 0bda73c0..8622cdd6 100644 --- a/conf/distro/include/rdk-bpi.inc +++ b/conf/distro/include/rdk-bpi.inc @@ -30,9 +30,6 @@ DISTRO_FEATURES_append = " CPUPROCANALYZER_BROADBAND" # RDKB-51565,RDKB-50795: [HAL] Cellular Hal Implementation DISTRO_FEATURES_append = " rdkb_cellular_manager_mm" -#Dac Feature support for BPIR4 device. -DISTRO_FEATURES_append = " dac" - DISTRO_FEATURES_append = " partner_default_ext" #Enable SDcard image as default diff --git a/conf/include/rdk-bpi-bbmasks.inc b/conf/include/rdk-bpi-bbmasks.inc index a308c743..1d866f53 100644 --- a/conf/include/rdk-bpi-bbmasks.inc +++ b/conf/include/rdk-bpi-bbmasks.inc @@ -13,3 +13,4 @@ BBMASK .= "|meta-cmf-filogic/recipes-ccsp/util/utopia-headers.bb" BBMASK .= "|meta-cmf-filogic/recipes-ccsp/hal/halinterface.bbappend" BBMASK .= "|meta-filogic/recipes-wifi/hal/halinterface.bbappend" BBMASK .= "|meta-rdk-ext/recipes-telephony/asterisk/asterisk_18.5.0.bb" +BBMASK .= "|meta-rdk-broadband-apps/recipes-kernel/linux/linux-%.bbappend" diff --git a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend index 86997bde..134dacb4 100644 --- a/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-kernel/linux/linux-mediatek_%.bbappend @@ -8,7 +8,7 @@ SRC_URI_append = " \ file://rdkb_cfg/coredump.cfg \ file://netfilter.cfg \ ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6', 'file://rdkb_cfg/kernel_6_6.cfg', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','dac', 'file://rdkb_cfg/container.cfg', '', d)} \ + file://rdkb_cfg/container.cfg \ ${@bb.utils.contains('DISTRO_FEATURES','sdmmc','file://rdkb_cfg/sdmmc.cfg','',d)} \ file://rdkb_cfg/wps_key.cfg \ file://enable_sdcard_6_6.patch;apply=no \ @@ -16,7 +16,7 @@ SRC_URI_append = " \ SRC_URI_append_mt7988 = "${@bb.utils.contains('DISTRO_FEATURES', 'cellular_hybrid_support', 'file://rdkb_cfg/rdkb-usb.cfg', '', d)}" -CMDLINE_append = "${@bb.utils.contains('DISTRO_FEATURES','dac', 'cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1', '', d)}" +CMDLINE_append = " cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1 " do_filogic_patches_append() { cd ${S} diff --git a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend index d4745370..cecd920f 100644 --- a/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend +++ b/meta-rdk-mtk-bpir4/recipes-rdkb/usp-pa/usp-pa.bbappend @@ -1 +1,2 @@ EXTRA_OECONF_remove_kirkstone = " --with-ccsp-platform=bcm --with-ccsp-arch=arm " +TARGET_CFLAGS += " -DINCLUDE_LCM_DATAMODEL " diff --git a/setup-environment-refboard-rdkb b/setup-environment-refboard-rdkb index e4ad3fd4..a295361f 100644 --- a/setup-environment-refboard-rdkb +++ b/setup-environment-refboard-rdkb @@ -28,6 +28,12 @@ if [ -e "${_TOPDIR}/meta-cmf-filogic/setup-environment-release" ]; then source meta-cmf-filogic/setup-environment-release fi +if [[ -z $(grep 'meta-rdk-broadband-apps' conf/bblayers.conf) ]] && [[ -d ../meta-rdk-broadband-apps ]] +then + cat >> conf/bblayers.conf <