Merge branch 'develop' into xdns

Author: cpokuru

.github/workflows/cla.yml

@@ -1,13 +1,20 @@
 name: "CLA"
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
 on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened,closed,synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA-Lite:
     name: "Signature"
-    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@main
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

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

@@ -1278,5 +1278,7 @@
   <Record name="dmsb.wanmanager.if.2.VirtualInterface.1.VlanCount" type="astr">0</Record>
   <Record name="dmsb.wanmanager.if.2.VirtualInterface.1.MarkingCount" type="astr">0</Record>
   <!-- Webconfig.service auto start record -->
-  <Record name="eRT.com.cisco.spvtg.ccsp.webpa.WebConfigRfcEnable" type="astr">true</Record>	  
+  <Record name="eRT.com.cisco.spvtg.ccsp.webpa.WebConfigRfcEnable" type="astr">true</Record>	 
+  <!-- Default WPA3 transition start record -->
+  <Record name="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.WPA3_Personal_Transition.Enable" type="astr">1</Record> 
 </Provision>

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

@@ -0,0 +1,84 @@
+Index: ethsw/rdkb_hal/src/ethsw/ccsp_hal_ethsw.c
+===================================================================
+--- ethsw.orig/rdkb_hal/src/ethsw/ccsp_hal_ethsw.c
++++ ethsw/rdkb_hal/src/ethsw/ccsp_hal_ethsw.c
+@@ -179,9 +179,13 @@ CcspHalEthSwGetPortStatus
+ #ifdef THREE_GMACS_SUPPORT
+     if(PortId == 5){
+         sprintf(ifName,"%s", "eth3");
+-    }else
++    }
+ #endif
++    else if (PortId == 1)
+     {
++	sprintf(ifName,"%s", "erouter0");
++    }
++    else{
+         sprintf(ifName, "lan%d", (PortId-1));
+     }
+     sprintf(path, "/sys/class/net/%s/carrier", ifName);
+@@ -337,8 +341,13 @@ CcspHalEthSwGetPortCfg
+ #ifdef THREE_GMACS_SUPPORT
+     if(PortId == 5){
+         sprintf(ifName,"%s", "eth3");
+-    }else
++    }
+ #endif
++    else if (PortId == 1)
++    {
++        sprintf(ifName,"%s", "erouter0");
++    }
++    else
+     {
+         sprintf(ifName, "lan%d", (PortId-1));
+     }
+@@ -469,7 +478,7 @@ CcspHalEthSwSetPortCfg
+ {
+     CcspHalEthSwTrace(("set port %d LinkRate to %d, DuplexMode to %d", PortId, LinkRate, DuplexMode));
+     
+-    if(PortId < 1 || PortId > MAX_LAN_PORT)
++    if(PortId <= 1 || PortId > MAX_LAN_PORT)
+         return  RETURN_ERR;
+ 
+     char cmd[128] = {0};
+@@ -579,7 +588,10 @@ CcspHalEthSwGetPortAdminStatus
+     }
+ 
+     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");
++    else
++        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),"lan",(PortId-1));
+ 
+     if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
+     {
+@@ -594,8 +606,8 @@ CcspHalEthSwGetPortAdminStatus
+     else
+         *pAdminStatus   = CCSP_HAL_ETHSW_AdminDown;
+     
+-    if(admin_status)
+-        *pAdminStatus   = CCSP_HAL_ETHSW_AdminDown;
++    /*if(admin_status)
++        *pAdminStatus   = CCSP_HAL_ETHSW_AdminDown; */
+ 	
+   return RETURN_OK;
+ }
+@@ -629,14 +641,14 @@ CcspHalEthSwSetPortAdminStatus
+     CcspHalEthSwTrace(("set port %d AdminStatus to %d", PortId, AdminStatus));
+     if(AdminStatus < CCSP_HAL_ETHSW_AdminUp || AdminStatus > CCSP_HAL_ETHSW_AdminTest)
+         return  RETURN_ERR;
+-    if(PortId < 1 || PortId > MAX_LAN_PORT)
++    if(PortId <= 1 || PortId > MAX_LAN_PORT)
+         return  RETURN_ERR;
+     
+     char cmd1[32] = {0};
+     char cmd2[32] = {0};
+ 
+-    sprintf(cmd1,"ip link set lan%d up",PortId);
+-    sprintf(cmd2,"ip link set lan%d down",PortId);
++    sprintf(cmd1,"ip link set lan%d up",(PortId-1));
++    sprintf(cmd2,"ip link set lan%d down",(PortId-1));
+ 
+     switch (PortId)
+     {

meta-rdk-mtk-bpir4/recipes-ccsp/hal/hal-ethsw-generic_git.bbappend

@@ -2,3 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 CFLAGS_append += " -D_PLATFORM_BANANAPI_R4_ "
 SRC_URI_append += "file://Add_interface_Changes.patch"
 SRC_URI_append += "file://gw_lan_refresh.patch"
+SRC_URI_append += "file://Ethernet-Lan-changes.patch"

setup-environment-refboard-rdkb

@@ -118,7 +118,11 @@ else # SD card image is default
     else
         echo "**********************************************************************"
         echo "> CAUTION: YOU ARE TRYING TO BUILD SD CARD IMAGE WITHOUT BL2 AND FIP BINARIES."
-        echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin"
+        if [ "X$KERNEL_TYPE" == "Xkernel6-6" ]; then
+             echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2025.01/bpi-r4_sdmmc_fip.bin"
+        else
+             echo "> Please download the binaries from https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_bl2.img and https://artifactory.rdkcentral.com/artifactory/RDKB-Platform/BPI-R4/uboot-2024.04/bpi-r4_sdmmc_fip.bin"
+	fi
         echo "> If you don't have access to above resources, please follow instruction in https://wiki.rdkcentral.com/pages/viewpage.action?pageId=354648448#SDMonoliticimagebuildandflashingstepsforBPIR4.-Buildingbl2.imgandfip.binincaseofnothavingaccesstoartifactoryrepository to build bl2 and fip binaries yourselves."
         echo "> Place those binaries under ${_TOPDIR}/downloads/"
         echo "> EXITING NOW."