diff --git a/iopsys-brcm63xx-arm/disc/base-files/etc/init.d/wifi_bringup b/iopsys-brcm63xx-arm/disc/base-files/etc/init.d/wifi_bringup
index 9b23ea0ba8c48f0c53c771b4f1ad33ddc7e64823..6bbf961dc9acc77031dbda3aa9f1407a1c064fd9 100755
--- a/iopsys-brcm63xx-arm/disc/base-files/etc/init.d/wifi_bringup
+++ b/iopsys-brcm63xx-arm/disc/base-files/etc/init.d/wifi_bringup
@@ -9,9 +9,15 @@ boot() {
 	# always use the data partition as data
 	mountpoint -q /data || mount -t ubifs ubi:data /data
 
+	BOARDID=$(cat /proc/nvram/boardid)
+	NVM_FILE="${BOARDID}.nvm"
+
 	[ ! -s /etc/wlan/kernel_nvram.setting -a -s /etc/wlan/kernel_nvram.fallback ] && \
 		cp  /etc/wlan/kernel_nvram.fallback /etc/wlan/kernel_nvram.setting
 
+	[ -f "/data/$NVM_FILE" ] && \
+		ln -sf "/data/$NVM_FILE" "/etc/wlan/nvram/$NVM_FILE"
+
 	/etc/init.d/hndnvram.sh start && \
 		[ -s /data/.kernel_nvram.setting ] && \
 		/etc/init.d/bcm-wlan-drivers.sh start || \
diff --git a/iopsys-brcm63xx-arm/smarthub3/base-files/etc/init.d/wifi_bringup b/iopsys-brcm63xx-arm/smarthub3/base-files/etc/init.d/wifi_bringup
index 79163de5f6f7781f0a5751422e153ed667ee7bb2..6d074785925a56c4aba16ab99d9876bdcbe0c2bb 100755
--- a/iopsys-brcm63xx-arm/smarthub3/base-files/etc/init.d/wifi_bringup
+++ b/iopsys-brcm63xx-arm/smarthub3/base-files/etc/init.d/wifi_bringup
@@ -9,9 +9,15 @@ boot() {
 	# always use the data partition as data
 	mountpoint -q /data || mount -t ext4 /dev/data /data
 
+	BOARDID=$(cat /proc/nvram/boardid)
+	NVM_FILE="${BOARDID}.nvm"
+
 	[ ! -s /etc/wlan/kernel_nvram.setting -a -s /etc/wlan/kernel_nvram.fallback ] && \
 		cp  /etc/wlan/kernel_nvram.fallback /etc/wlan/kernel_nvram.setting
 
+	[ -f "/data/$NVM_FILE" ] && \
+		ln -sf "/data/$NVM_FILE" "/etc/wlan/nvram/$NVM_FILE"
+
 	/etc/init.d/hndnvram.sh start && \
 		[ -s /data/.kernel_nvram.setting ] && \
 		/etc/init.d/bcm-wlan-drivers.sh start || \