Merge branch 'rdkcentral:develop' into bpi_extender_6_6_kernel

Author: ap934

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

@@ -34,4 +34,3 @@ DISTRO_FEATURES_append = " generic_mlo"
 
 # Kernel 6.6
 #DISTRO_FEATURES_append = " kernel6-6"
-

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-p-and-m.bbappend

@@ -1 +1,2 @@
 include ccsp_common_bananapi.inc
+SRC_URI:remove = "file://filogic-factoryReset.patch"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-psm/bbhm_def_cfg_banana.xml

@@ -214,6 +214,9 @@
   <Record name="eRT.com.cisco.spvtg.ccsp.tr181pa.Device.WiFi.Radio.2.FactoryResetSSID" type="astr">0</Record>
   <Record name="eRT.com.cisco.spvtg.ccsp.tr181pa.Device.WiFi.SsidUpgradeRequired" type="astr">1</Record>
 
+ <!-- Ethernet interfaces of BananaPi Pi -->
+  <Record name="dmsb.ethagent.ethifcount" type="astr">4</Record>
+
   <Record name="dmsb.BridgeNamePrefix" type="astr">brlan</Record>
   <Record name="dmsb.bridgeVlanRange" type="astr">164...512</Record>
 

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/Ethernet-Lan-changes.patch

@@ -47,9 +47,9 @@ Index: ethsw/rdkb_hal/src/ethsw/ccsp_hal_ethsw.c
      memset(&ifr, 0, sizeof(ifr));
 -    snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", "eth1");
 +    if (PortId == 1)
-+	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "erouter0");
++	       snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", "erouter0");
 +    else
-+        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),"lan",(PortId-1));
++        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),"lan%d",(PortId-1));
 
      if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
      {

meta-rdk-mtk-bpir4/recipes-core/images/rdk-generic-ap-extender-image.bbappend

@@ -59,7 +59,6 @@ IMAGE_INSTALL += " \
     strongswan \
     libpcap \
     tcpdump \
-    ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','linux-firmware-mt7988  linux-firmware-airoha fitblk','airoha-eth-firmware',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','kernel6-6','','perf',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','mt76','packagegroup-filogic-mt76','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','em_extender','packagegroup-ap-extender','',d)} \