diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
index f5158422b4..757480daee 100644
--- a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
+++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
@@ -28,8 +28,8 @@
   gpu_mem=128
 
 # SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem'
-  gpu_mem_256=128
-  gpu_mem_512=128
+# gpu_mem_256=128
+# gpu_mem_512=128
 
 ################################################################################
 # Overclocking settings
@@ -86,6 +86,11 @@
 # Force HDMI even if unplugged or powered off
 # hdmi_force_hotplug=1
 
+# Doesn't sent initial active source message.
+# Avoids bringing CEC (enabled TV) out of standby and channel switch when
+# rebooting.
+  hdmi_ignore_cec_init=1
+
 ################################################################################
 # License keys to enable GPU hardware decoding for various codecs
 # to obtain keys visit the shop at http://www.raspberrypi.com
diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh
index 9ae274314a..79c8f0d038 100755
--- a/packages/tools/bcm2835-bootloader/scripts/update.sh
+++ b/packages/tools/bcm2835-bootloader/scripts/update.sh
@@ -42,9 +42,10 @@
     mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk
     cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \
         $BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt
-  else
-    sed -e "s,# gpu_mem_256=100,gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt
-    sed -e "s,# gpu_mem_512=128,gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
+#  else
+#    sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt
+#    sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt
+#    sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
   fi
 
 # mount $BOOT_ROOT r/o