Merge "Get mobile app telemetry working again."
diff --git a/fs/skeleton/etc/init.d/network b/fs/skeleton/etc/init.d/network
index 2b15d8e..4edcc21 100755
--- a/fs/skeleton/etc/init.d/network
+++ b/fs/skeleton/etc/init.d/network
@@ -152,10 +152,10 @@
# On GFRG250, the Quantenna PCIe module has not initialized by the time the
# kernel enumerates PCIe devices. For development, also include GFRG200 and
# GFRG210.
- if contains "GFRG200 GFRG210 GFRG250" "$(cat /etc/platform)"; then
+ if contains ",GFRG200,GFRG210,GFRG250," ",$(cat /etc/platform),"; then
echo 1 > /sys/bus/pci/rescan
fi
- if contains "GFHD254" "$(cat /etc/platform)" && ! startswith "$(uname -r)" "3"; then
+ if contains ",GFHD254," ",$(cat /etc/platform)," && ! startswith "$(uname -r)" "3"; then
echo 1 > /sys/bus/pci/devices/0000:01:00.0/remove
sleep 1
echo 1 > /sys/bus/pci/rescan
diff --git a/fs/skeleton/usr/bin/set_laser_channel.platform_gfiberlt b/fs/skeleton/usr/bin/set_laser_channel.platform_gfiberlt
index e822152..439709e 100755
--- a/fs/skeleton/usr/bin/set_laser_channel.platform_gfiberlt
+++ b/fs/skeleton/usr/bin/set_laser_channel.platform_gfiberlt
@@ -40,7 +40,7 @@
fi
# Program the laser channel.
-result=$(i2cset -y 0 0x51 0x91 $1)
+result=$(i2cset -y 0 0x51 0x90 $1 i)
if [ "$?" -ne "0" ]; then
echo "Failed to set laser channel! i2cset error: $result"
exit 1
diff --git a/linux/linux.mk b/linux/linux.mk
index 1320e9a..88b83f2 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -45,10 +45,6 @@
INSTALL_MOD_PATH=$(TARGET_DIR) \
CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
DEPMOD=$(HOST_DIR)/usr/sbin/depmod
- initramfs=true
-# (initramfs=true replaces the $(initramfs) build command with 'true',
-# effectively making the kernel build scripts never replace the initramfs
-# with a different one; making the initramfs is our job in buildroot.)
# Get the real Linux version, which tells us where kernel modules are
# going to be installed in the target filesystem.
diff --git a/package/mv_app/xml_params/i2c_xml_cfg_file.xml b/package/mv_app/xml_params/i2c_xml_cfg_file.xml
index b41c999..3512bfa 100644
--- a/package/mv_app/xml_params/i2c_xml_cfg_file.xml
+++ b/package/mv_app/xml_params/i2c_xml_cfg_file.xml
@@ -2,6 +2,6 @@
<cnfg>
<I2C_CONFIG>
<!-- Whether the transceiver can use i2c block read or character read 0-automatic, 1-read byte, 2-read block -->
- <i2c_xvr_read_mode>0</i2c_xvr_read_mode>
+ <i2c_xvr_read_mode>2</i2c_xvr_read_mode>
</I2C_CONFIG>
</cnfg>
