Skip to content

Commit 34bd368

Browse files
manigandanjmanigandanj
authored
Merge branch 'develop' into RDKBACCL-537_RNDIS
2 parents 4ffcd4b + dcfe5f4 commit 34bd368

File tree

120 files changed

+9903
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+9903
-110
lines changed

‎conf/distro/include/rdk-bpi-ap-extender.inc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ DISTRO_FEATURES_append = " CONFIG_IEEE80211BE"
3131
DISTRO_FEATURES_append = " generic_mlo"
3232
#PPP Feature
3333
#DISTRO_FEATURES_append = "ppp-enabled"
34+
35+
# Kernel 6.6
36+
#DISTRO_FEATURES_append = " kernel6-6"

‎conf/layer.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/distro/inclu
1616
require ${@bb.utils.contains('DISTRO_FEATURES', 'em_extender','conf/include/rdk-bpi-ap-extender-bbmasks.inc','conf/include/rdk-bpi-bbmasks.inc', d)}
1717

1818
LAYERSERIES_COMPAT_cmf-bananapi = " kirkstone"
19+
20+
MIDDLEWARE_ARCH = "${MACHINE}"
21+
PACKAGE_EXTRA_ARCHS_append = " ${MIDDLEWARE_ARCH}"

‎conf/machine/bananapi4-rdk-broadband-ap-extender.conf‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@
66

77
RUST_PANIC_STRATEGY="abort"
88

9-
require conf/machine/filogic880-bpi-r4.conf
9+
require conf/distro/include/rdk-bpi-ap-extender.inc
10+
11+
require ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','conf/machine/filogic880-kernel6-6-bpi-r4.conf','conf/machine/filogic880-bpi-r4.conf',d)}
1012
DISTRO_FEATURES_append = " em_extender"
11-
require conf/distro/include/rdk-bpi-ap-extender.inc
1213
PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
1314
MACHINE_IMAGE_NAME = "rdk-generic-ap-extender-image"
1415

1516
#SDCARD supported changes.
1617
MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
1718
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','wic.bz2 ext4','',d)}"
18-
KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
19+
KERNEL_DEVICETREE_mt7988_bpi4_sd = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','mediatek/mt7988a-bananapi-bpi-r4.dtb','mediatek/mt7988a-bananapi-bpi-r4-sd.dtb', d)}"
1920

20-
WKS_FILE = " ${@bb.utils.contains('DISTRO_FEATURES','EasyMesh',' sdimage-EM-Bananapi.wks',' sdimage-Bananapi.wks',d)}"
21-
IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
21+
WKS_FILE = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'sdimage-EM-Bananapi_6-6.wks','sdimage-EM-Bananapi.wks', d)}"
22+
IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc', bb.utils.contains('DISTRO_FEATURES','kernel6-6','mt7988a-bananapi-bpi-r4.dtb ${KERNEL_IMAGETYPE}','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}', d),'',d)}"
2223
do_image_wic[recrdeps] = "do_build"
2324
#SDCARD supported Pre build bootloader
2425
do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
26+
27+
#removing itb-image class for kernel6-6
28+
KERNEL_CLASSES_remove = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','itb-image','',d)}"

‎conf/machine/bananapi4-rdk-broadband.conf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
1616
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc',' wic.bz2 ext4','',d)}"
1717
KERNEL_DEVICETREE_mt7988_bpi4_sd = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','mediatek/mt7988a-bananapi-bpi-r4.dtb','mediatek/mt7988a-bananapi-bpi-r4-sd.dtb', d)}"
1818

19-
WKS_FILE = " ${@bb.utils.contains('DISTRO_FEATURES','EasyMesh',' sdimage-EM-Bananapi.wks',' sdimage-Bananapi.wks',d)}"
19+
WKS_FILE = "${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', \
20+
bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', 'sdimage-EM-Bananapi_6-6.wks', 'sdimage-Bananapi_6-6.wks', d), \
21+
bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', 'sdimage-EM-Bananapi.wks', 'sdimage-Bananapi.wks', d), d)}"
2022
IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc', bb.utils.contains('DISTRO_FEATURES','kernel6-6','mt7988a-bananapi-bpi-r4.dtb ${KERNEL_IMAGETYPE}','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}', d),'',d)}"
2123
do_image_wic[recrdeps] = "do_build"
2224
#SDCARD supported Pre build bootloader

‎meta-rdk-mtk-bpir4/recipes-bsp/trusted-firmware-a/bootloader_prebuild.bb‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,30 @@ do_configure[noexec] = "1"
1717
# since there is no 'main' package generated (empty)
1818
RDEPENDS_${PN}-dev = ""
1919

20-
SRC_URI_append += " file://bpi-r4_sdmmc_bl2.img \
21-
file://bpi-r4_sdmmc_fip.bin"
20+
SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', \
21+
' file://bpi-r4_sdmmc_bl2_6-6.img \
22+
file://bpi-r4_sdmmc_fip_6-6.bin \
23+
file://bpi-r4_sdmmc_bl2_B_6-6.img \
24+
file://bpi-r4_sdmmc_fip_B_6-6.bin', \
25+
' file://bpi-r4_sdmmc_bl2.img \
26+
file://bpi-r4_sdmmc_fip.bin \
27+
file://bpi-r4_sdmmc_bl2_B.img \
28+
file://bpi-r4_sdmmc_fip_B.bin', d)}"
2229

2330
do_deploy() {
2431
mkdir -p ${DEPLOYDIR}/atf/
32+
if ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6-6', 'true', 'false', d)}; then
33+
echo "Deploying kernel 6.6 BL2/FIP binaries..."
34+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_6-6.img ${DEPLOYDIR}/atf/
35+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_B_6-6.img ${DEPLOYDIR}/atf/
36+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_6-6.bin ${DEPLOYDIR}/atf/
37+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_B_6-6.bin ${DEPLOYDIR}/atf/
38+
else
39+
echo "Deploying default BL2/FIP binaries..."
2540
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2.img ${DEPLOYDIR}/atf/
41+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_bl2_B.img ${DEPLOYDIR}/atf/
2642
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip.bin ${DEPLOYDIR}/atf/
43+
install -m 0644 ${WORKDIR}/bpi-r4_sdmmc_fip_B.bin ${DEPLOYDIR}/atf/
44+
fi
2745
}
2846
addtask do_deploy after do_install

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ do_install_append_class-target() {
7575
sed -i '$a [Install]\nWantedBy=multi-user.target' ${D}${systemd_unitdir}/system/onewifi.service
7676
fi
7777
sed -i '/IsErouterRunningStatus/,/fi/ s/^/#/' ${D}/usr/ccsp/ccspPAMCPCheck.sh
78+
sed -i '/ExecStart=/i ExecStartPre=/usr/bin/start_cron' ${D}/lib/systemd/system/RdkFwUpgradeManager.service
7879
}
7980

8081

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
22

33
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
4-
SRCREV_libwebconfig = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
4+
SRCREV_libwebconfig = "8e08be25456e28de996fcdef077d826463180395"
55

66
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
77
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
44

55
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
66
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
7-
SRCREV_OneWifi = "3b7620e682234e92b269d77a84eaf1fc7a1b6176"
7+
SRCREV_OneWifi = "8e08be25456e28de996fcdef077d826463180395"
88
DEPENDS_append = " mesh-agent "
99
DEPENDS_remove = " opensync "
1010
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

0 commit comments

Comments
 (0)