Skip to content

Commit a2e2644

Browse files
scthunderboltscthunderbolt
authored
Merge branch 'develop' into RDKBACCL-1037
2 parents 264f29a + 4f08694 commit a2e2644

26 files changed

+481
-161
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,6 @@ DISTRO_FEATURES_append = " wps_support"
5555

5656
#Enable resource optimization
5757
DISTRO_FEATURES_append = " resource_optimization"
58+
59+
#Enable kernel_6_6 support
60+
#DISTRO_FEATURES_append = " kernel6-6"

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
#@DESCRIPTION: Machine configuration for running a RDK broadband on Banana Pi R4
55
#@RDK_FLAVOR: rdkb
66

7-
require conf/machine/filogic880-bpi-r4.conf
7+
require ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','conf/machine/filogic880-kernel6-6-bpi-r4.conf','conf/machine/filogic880-bpi-r4.conf',d)}
88

99
require conf/distro/include/rdk-bpi.inc
1010
PREFERRED_PROVIDER_hal-wifi_onewifi = "hal-wifi-generic"
1111

1212
#SDCARD supported changes.
1313
MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','sdmmc',':sd','',d)}"
1414
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES','sdmmc',' wic.bz2 ext4','',d)}"
15-
KERNEL_DEVICETREE_mt7988_bpi4_sd = "mediatek/mt7988a-bananapi-bpi-r4-sd.dtb"
15+
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)}"
1616

17-
WKS_FILE = " sdimage-Bananapi.wks"
18-
IMAGE_BOOT_FILES = "${@bb.utils.contains('DISTRO_FEATURES','sdmmc','mt7988a-bananapi-bpi-r4-sd.dtb ${KERNEL_IMAGETYPE}','',d)}"
17+
WKS_FILE = " ${@bb.utils.contains('DISTRO_FEATURES','EasyMesh',' sdimage-EM-Bananapi.wks',' sdimage-Bananapi.wks',d)}"
18+
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)}"
1919
do_image_wic[recrdeps] = "do_build"
2020
#SDCARD supported Pre build bootloader
2121
do_image_wic[depends] += " atf_bootloader_prebuild:do_deploy"
2222

2323
#RUST support for EasyMesh
2424
RUST_PANIC_STRATEGY="${@bb.utils.contains('DISTRO_FEATURES','EasyMesh','abort','',d)}"
25+
26+
#removing itb-image class for kernel6-6
27+
KERNEL_CLASSES_remove = "${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','itb-image','',d)}"

‎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
@@ -59,6 +59,7 @@ do_install_append_class-target() {
5959
sed -i '/^After=CcspPandMSsp\.service$/d' ${D}${systemd_unitdir}/system/onewifi.service
6060
sed -i '$a [Install]\nWantedBy=multi-user.target' ${D}${systemd_unitdir}/system/onewifi.service
6161
fi
62+
sed -i '/IsErouterRunningStatus/,/fi/ s/^/#/' ${D}/usr/ccsp/ccspPAMCPCheck.sh
6263
}
6364

6465

‎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 = "65b039f972e77d9bd84b8c071597dde4d1535bad"
4+
SRCREV_libwebconfig = "398846f14a71ec8bddde3213375cc1895d006cad"
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 = "65b039f972e77d9bd84b8c071597dde4d1535bad"
7+
SRCREV_OneWifi = "398846f14a71ec8bddde3213375cc1895d006cad"
88
DEPENDS_append = " mesh-agent "
99
DEPENDS_remove = " opensync "
1010
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ctrl.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,50 @@
22
sleep 20
33

44
iw phy phy0 interface add wifi0 type __ap
5+
iw phy phy0 interface add wifi0.1 type __ap
6+
iw phy phy0 interface add wifi0.2 type __ap
57
iw phy phy0 interface add wifi1 type __ap
68
iw phy phy0 interface add wifi1.1 type __ap
9+
iw phy phy0 interface add wifi1.2 type __ap
10+
iw phy phy0 interface add wifi1.3 type __ap
711
iw phy phy0 interface add wifi2 type __ap
812

913
#Obtain the wifi mac address
10-
wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2`
14+
wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
15+
wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
16+
wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
1117
wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
1218
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
13-
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
19+
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
20+
wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
21+
wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
1422

1523
#Update the mac address using ip link command
1624
ifconfig wifi0 down
25+
ifconfig wifi0.1 down
26+
ifconfig wifi0.2 down
1727
ifconfig wifi1 down
1828
ifconfig wifi1.1 down
29+
ifconfig wifi1.2 down
30+
ifconfig wifi1.3 down
1931
ifconfig wifi2 down
2032

2133
ip link set dev wifi0 address $wifi0_mac
34+
ip link set dev wifi0.1 address $wifi0_1_mac
35+
ip link set dev wifi0.2 address $wifi0_2_mac
2236
ip link set dev wifi1 address $wifi1_mac
2337
ip link set dev wifi1.1 address $wifi1_1_mac
38+
ip link set dev wifi1.2 address $wifi1_2_mac
39+
ip link set dev wifi1.3 address $wifi1_3_mac
2440
ip link set dev wifi2 address $wifi2_mac
2541

2642
ifconfig wifi0 up
43+
ifconfig wifi0.1 up
44+
ifconfig wifi0.2 up
2745
ifconfig wifi1 up
2846
ifconfig wifi1.1 up
47+
ifconfig wifi1.2 up
48+
ifconfig wifi1.3 up
2949
ifconfig wifi2 up
3050

3151
exit 0

‎meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/onewifi_pre_start_em_ext.sh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,56 @@
22
sleep 5
33

44
iw phy phy0 interface add wifi0 type __ap
5-
iw phy phy0 interface add wifi1.2 type __ap
5+
iw phy phy0 interface add wifi0.1 type __ap
6+
iw phy phy0 interface add wifi0.2 type __ap
67
iw phy phy0 interface add wifi1 type __ap
7-
iw phy phy0 interface add wifi2 type __ap
88
iw phy phy0 interface add wifi1.1 type __ap
9+
iw phy phy0 interface add wifi1.2 type __ap
10+
iw phy phy0 interface add wifi1.3 type __ap
11+
iw phy phy0 interface add wifi2 type __ap
912

1013
#Obtain the wifi mac address
1114
wifi0_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0 | cut -d " " -f 2 | head -n1`
15+
wifi0_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2 | head -n1`
16+
wifi0_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.2 | cut -d " " -f 2 | head -n1`
1217
wifi1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1 | cut -d " " -f 2 | head -n1`
1318
wifi2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi2 | cut -d " " -f 2`
14-
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi0.1 | cut -d " " -f 2`
15-
wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2`
19+
wifi1_1_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.1 | cut -d " " -f 2 | head -n1`
20+
wifi1_2_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.2 | cut -d " " -f 2 | head -n1`
21+
wifi1_3_mac=`cat /nvram/mac_addresses.txt | grep -a wifi1.3 | cut -d " " -f 2 | head -n1`
1622

1723
#Update the mac address using ip link command
1824
ifconfig wifi0 down
19-
ifconfig wifi1.2 down
25+
ifconfig wifi0.1 down
26+
ifconfig wifi0.2 down
2027
ifconfig wifi1 down
2128
ifconfig wifi1.1 down
29+
ifconfig wifi1.2 down
30+
ifconfig wifi1.3 down
2231
ifconfig wifi2 down
32+
2333
ip link set dev wifi0 address $wifi0_mac
24-
ip link set dev wifi1.2 address $wifi1_1_mac
34+
ip link set dev wifi0.1 address $wifi0_1_mac
35+
ip link set dev wifi0.2 address $wifi0_2_mac
2536
ip link set dev wifi1 address $wifi1_mac
26-
ip link set dev wifi1.1 address $wifi1_2_mac
37+
ip link set dev wifi1.1 address $wifi1_1_mac
38+
ip link set dev wifi1.2 address $wifi1_2_mac
39+
ip link set dev wifi1.3 address $wifi1_3_mac
2740
ip link set dev wifi2 address $wifi2_mac
41+
2842
ifconfig wifi0 up
29-
ifconfig wifi1.2 up
43+
ifconfig wifi0.1 up
44+
ifconfig wifi0.2 up
3045
ifconfig wifi1 up
3146
ifconfig wifi1.1 up
47+
ifconfig wifi1.2 up
48+
ifconfig wifi1.3 up
3249
ifconfig wifi2 up
3350

3451
#To update al_mac addr in EasymesgCfg.json
3552
al_mac_addr=`cat /nvram/EasymeshCfg.json | grep AL_MAC_ADDR | cut -d '"' -f4`
36-
al_mac=`iw dev wifi1.2 info | grep addr | cut -d ' ' -f2`
37-
53+
al_mac=`iw dev wifi1.3 info | grep addr | cut -d ' ' -f2`
54+
3855
if [ "$al_mac_addr" = "00:00:00:00:00:00" ]; then
3956
sed -i "s/$al_mac_addr/$al_mac/g" /nvram/EasymeshCfg.json
4057
fi

‎meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em_ext.json‎ renamed to ‎meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em.json‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"InterfaceName": "wifi2",
1212
"Bridge": "brlan0",
1313
"vlanId": 0,
14-
"vapIndex": 4,
14+
"vapIndex": 16,
1515
"vapName": "private_ssid_6g"
1616
}
1717
]
@@ -20,18 +20,25 @@
2020
"Index": 1,
2121
"RadioName": "wifi1",
2222
"InterfaceList": [
23+
{
24+
"InterfaceName": "wifi1.3",
25+
"Bridge": "brlan0",
26+
"vlanId": 0,
27+
"vapIndex": 15,
28+
"vapName": "mesh_sta_5g"
29+
},
2330
{
2431
"InterfaceName": "wifi1.2",
2532
"Bridge": "brlan0",
2633
"vlanId": 0,
2734
"vapIndex": 3,
28-
"vapName": "mesh_sta_5g"
35+
"vapName": "iot_ssid_5g"
2936
},
3037
{
3138
"InterfaceName": "wifi1.1",
3239
"Bridge": "brlan0",
3340
"vlanId": 0,
34-
"vapIndex": 2,
41+
"vapIndex": 13,
3542
"vapName": "mesh_backhaul_5g"
3643
},
3744
{
@@ -48,6 +55,20 @@
4855
"Index": 0,
4956
"RadioName": "wifi0",
5057
"InterfaceList": [
58+
{
59+
"InterfaceName": "wifi0.2",
60+
"Bridge": "brlan0",
61+
"vlanId": 0,
62+
"vapIndex": 2,
63+
"vapName": "iot_ssid_2g"
64+
},
65+
{
66+
"InterfaceName": "wifi0.1",
67+
"Bridge": "brlan0",
68+
"vlanId": 0,
69+
"vapIndex": 12,
70+
"vapName": "mesh_backhaul_2g"
71+
},
5172
{
5273
"InterfaceName": "wifi0",
5374
"Bridge": "brlan0",

‎meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em_ctrl.json‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/InterfaceMap_em_ext1.json‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)