Merge branch 'develop' into 978

Author: anatar818

meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend

@@ -82,8 +82,8 @@ echo "#SelfHeal
 \$EnableTR69Binary=true
 
 #Custom Data Model
-$custom_data_model_enabled=0
-$custom_data_model_file_name=/usr/ccsp/tr069pa/custom_mapper.xml"  >> ${D}${sysconfdir}/utopia/system_defaults
+\$custom_data_model_enabled=0
+\$custom_data_model_file_name=/usr/ccsp/tr069pa/custom_mapper.xml"  >> ${D}${sysconfdir}/utopia/system_defaults
 
 #Remote management
 sed -i 's/^\(\$mgmt_wan_httpsaccess=\)0/\11/' ${D}${sysconfdir}/utopia/system_defaults

meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend

@@ -16,6 +16,8 @@ if [ $? -eq 0 ];then \
                 ifconfig lan${i} hw ether $LAN_MAC \
         fi \
    done \
+   BRLAN_MAC=`cat /nvram/mac_addresses.txt | grep -a brlan0 | cut -d " " -f 2` \
+   ifconfig brlan0 hw ether $BRLAN_MAC \
 fi' ${D}${sbindir}/init-bridge.sh
 }