From 779c266e231b91ef39d64b1692d27b4a8e45bb4a Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 19 Jun 2019 15:56:53 +0100
Subject: [PATCH] 20190619 build

Fix composite output options for Pi 4

Keep splash screen settings when changing GPU options
---
 debian/changelog |  8 ++++++++
 raspi-config     | 20 ++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4833fb..8f25710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+raspi-config (20190619) buster; urgency=medium
+
+  [ Simon Long ]
+  * Fix composite output options for Pi 4
+  * Keep splash screen settings when changing GPU options
+
+ -- Serge Schneider <serge@raspberrypi.org>  Wed, 19 Jun 2019 15:49:38 +0100
+
 raspi-config (20190607) buster; urgency=medium
 
   [ Simon Long ]
diff --git a/raspi-config b/raspi-config
index 1810080..e2842d7 100644
--- a/raspi-config
+++ b/raspi-config
@@ -996,7 +996,7 @@ get_autologin() {
 get_pi4video () {
   if grep -q "^hdmi_enable_4k=1" $CONFIG ; then
     echo 1
-  elif grep -q "^hdmi_ignore_composite=0" $CONFIG ; then
+  elif grep -q "^enable_tvout=1" $CONFIG ; then
     echo 2
   else
     echo 0
@@ -1025,7 +1025,7 @@ do_pi4video() {
     case "$VIDOPT" in
       V1*)
         sed $CONFIG -i -e "s/^#\?hdmi_enable_4k=.*/hdmi_enable_4k=1/"
-        sed $CONFIG -i -e "s/^hdmi_ignore_composite=/#hdmi_ignore_composite=/"
+        sed $CONFIG -i -e "s/^enable_tvout=/#enable_tvout=/"
         if ! grep -q "hdmi_enable_4k" $CONFIG ; then
             sed $CONFIG -i -e "\$ahdmi_enable_4k=1"
         fi
@@ -1033,17 +1033,17 @@ do_pi4video() {
         OPT=1
         ;;
       V2*)
-        sed $CONFIG -i -e "s/^#\?hdmi_ignore_composite=.*/hdmi_ignore_composite=0/"
+        sed $CONFIG -i -e "s/^#\?enable_tvout=.*/enable_tvout=1/"
         sed $CONFIG -i -e "s/^hdmi_enable_4k=/#hdmi_enable_4k=/"
-        if ! grep -q "hdmi_ignore_composite" $CONFIG ; then
-            sed $CONFIG -i -e "\$ahdmi_ignore_composite=0"
+        if ! grep -q "enable_tvout" $CONFIG ; then
+            sed $CONFIG -i -e "\$aenable_tvout=1"
         fi
         STATUS="analog TV enabled"
         OPT=2
         ;;
       V3*)
         sed $CONFIG -i -e "s/^hdmi_enable_4k=/#hdmi_enable_4k=/"
-        sed $CONFIG -i -e "s/^hdmi_ignore_composite=/#hdmi_ignore_composite=/"
+        sed $CONFIG -i -e "s/^enable_tvout=/#enable_tvout=/"
         STATUS="4K and analog disabled"
         OPT=0
         ;;
@@ -1429,14 +1429,6 @@ do_gldriver() {
   else
     return 0
   fi
-  if echo "$GLOPT" | grep -q -E "1" ; then
-    if grep -q "splash" $CMDLINE ; then
-      sed -i $CMDLINE -e "s/ quiet//"
-      sed -i $CMDLINE -e "s/ splash//"
-      sed -i $CMDLINE -e "s/ plymouth.ignore-serial-consoles//"
-    fi
-    sed $CONFIG -i -e "s/^gpu_mem/#gpu_mem/"
-  fi
   whiptail --msgbox "$STATUS" 20 60 1
 }