brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 20:20:06 +09:00
Code Issues Projects Releases Wiki Activity

20190619 build

Browse Source 
Fix composite output options for Pi 4

Keep splash screen settings when changing GPU options
This commit is contained in:
Serge Schneider 2019-06-19 15:56:53 +01:00
parent 28666b8358
commit 779c266e23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 raspi-config (20190607) buster; urgency=medium
[ Simon Long ] [ Simon Long ]

20
raspi-config
View File

@ -996,7 +996,7 @@ get_autologin() {
get_pi4video () { get_pi4video () {
if grep -q "^hdmi_enable_4k=1" $CONFIG ; then if grep -q "^hdmi_enable_4k=1" $CONFIG ; then
echo 1 echo 1
elif grep -q "^hdmi_ignore_composite=0" $CONFIG ; then elif grep -q "^enable_tvout=1" $CONFIG ; then
echo 2 echo 2
else else
echo 0 echo 0
@ -1025,7 +1025,7 @@ do_pi4video() {
case "$VIDOPT" in case "$VIDOPT" in
V1*) V1*)
sed $CONFIG -i -e "s/^#\?hdmi_enable_4k=.*/hdmi_enable_4k=1/" 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 if ! grep -q "hdmi_enable_4k" $CONFIG ; then
sed $CONFIG -i -e "\$ahdmi_enable_4k=1" sed $CONFIG -i -e "\$ahdmi_enable_4k=1"
fi fi
@ -1033,17 +1033,17 @@ do_pi4video() {
OPT=1 OPT=1
;; ;;
V2*) 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=/" sed $CONFIG -i -e "s/^hdmi_enable_4k=/#hdmi_enable_4k=/"
if ! grep -q "hdmi_ignore_composite" $CONFIG ; then if ! grep -q "enable_tvout" $CONFIG ; then
sed $CONFIG -i -e "\$ahdmi_ignore_composite=0" sed $CONFIG -i -e "\$aenable_tvout=1"
fi fi
STATUS="analog TV enabled" STATUS="analog TV enabled"
OPT=2 OPT=2
;; ;;
V3*) V3*)
sed $CONFIG -i -e "s/^hdmi_enable_4k=/#hdmi_enable_4k=/" 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" STATUS="4K and analog disabled"
OPT=0 OPT=0
;; ;;
@ -1429,14 +1429,6 @@ do_gldriver() {
else else
return 0 return 0
fi 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 whiptail --msgbox "$STATUS" 20 60 1
} }