From 9546d10e2c1717c38735ed7b00ff3ccea163c10c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jun 11 2022 18:49:58 +0000
Subject: config.txt updates


---

diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index aff730d..9c55482 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -8,7 +8,7 @@
 
 Name:          bcm283x-firmware
 Version:       20220527
-Release:       1.%{gitshort}%{?dist}
+Release:       2.%{gitshort}%{?dist}
 Summary:       Firmware for the Broadcom bcm283x/bcm2711 used in the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -99,6 +99,9 @@ install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 %{efi_esp_root}/start4*
 
 %changelog
+* Sat Jun 11 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 20220527-2.f145afc
+- Updates for default config.txt
+
 * Fri May 27 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 20220527-1.f145afc
 - Update to latest firmware
 
diff --git a/config-64.txt b/config-64.txt
index e1b051a..a04354c 100644
--- a/config-64.txt
+++ b/config-64.txt
@@ -1,18 +1,36 @@
-# Raspberry Pi 3
-[pi3]
-kernel=rpi3-u-boot.bin
-dtoverlay=upstream
+# Options you can adjust for all Raspberry Pi Revisions
+# https://www.raspberrypi.com/documentation/computers/config_txt.html
 
 # Raspberry Pi Zero 2W
 [pi02]
 kernel=rpi3-u-boot.bin
 dtoverlay=upstream
 
+# Raspberry Pi 3
+[pi3]
+kernel=rpi3-u-boot.bin
+dtoverlay=upstream
+
 # Raspberry Pi 4
 [pi4]
 kernel=rpi4-u-boot.bin
 dtoverlay=upstream-pi4
 
+# For RPi400 and newer rev RPi4s
+arm_boost=1
+
+# Enable DRM VC4 V3D driver
+# dtoverlay=vc4-kms-v3d
+dtoverlay=vc4-kms-v3d-pi4
+dtoverlay=cma,cma-256
+max_framebuffers=2
+# 4K display support - RPi4 only, only one port possible
+# hdmi_enable_4kp60=1
+
+# Raspberry Pi CM4
+[cm4]
+otg_mode=1
+
 # Default Fedora configs for all Raspberry Pi Revisions
 [all]
 # Put the RPi into 64 bit mode
@@ -38,23 +56,24 @@ gpu_mem=32
 # Use eXtended firmware by default
 start_x=1
 
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+audio_pwm_mode=2
+
+# Automatically load overlays for detected cameras
+camera_auto_detect=1
+
+# Automatically load overlays for detected DSI displays
+display_auto_detect=1
+
 # Stop the RPi turning on HDMI monitors on reboot
 hdmi_ignore_cec_init=1
 
-# New option to allow the firmware to load upstream dtb
-# Will allow things like camera, touchscreen etc to work OOTB
-upstream_kernel=1
-
 # HAT and DT overlays. Documentation at Raspberry Pi here:
 # https://www.raspberrypi.org/documentation/configuration/device-tree.md
 # Each dtoverlay line is an individual HAT/overlay, multiple lines allowed
 # dtoverlay=rpi-sense
 
-# Other options you can adjust for all Raspberry Pi Revisions
-# https://www.raspberrypi.org/documentation/configuration/config-txt/README.md
-# All options documented at http://elinux.org/RPiconfig
-# for more options see http://elinux.org/RPi_config.txt
-
 # To use this on Fedora you need to use firmware provided device tree, not kernel
 # For this functionality follow the following guide:
 # https://fedoraproject.org/w/index.php?title=Architectures/ARM/Raspberry_Pi/HATs
diff --git a/config.txt b/config.txt
index a427f76..6d9ce21 100644
--- a/config.txt
+++ b/config.txt
@@ -1,3 +1,11 @@
+# Options you can adjust for all Raspberry Pi Revisions
+# https://www.raspberrypi.com/documentation/computers/config_txt.html
+
+# Raspberry Pi Zero 2W
+[pi02]
+kernel=rpi3-u-boot.bin
+dtoverlay=upstream
+
 # Raspberry Pi 2
 [pi2]
 kernel=rpi2-u-boot.bin
@@ -13,6 +21,21 @@ dtoverlay=upstream
 kernel=rpi4-u-boot.bin
 dtoverlay=upstream-pi4
 
+# For RPi400 and newer rev RPi4s
+arm_boost=1
+
+# Enable DRM VC4 V3D driver
+# dtoverlay=vc4-kms-v3d
+dtoverlay=vc4-kms-v3d-pi4
+dtoverlay=cma,cma-256
+max_framebuffers=2
+# 4K display support - RPi4 only, only one port possible
+# hdmi_enable_4kp60=1
+
+# Raspberry Pi CM4
+[cm4]
+otg_mode=1
+
 # Default Fedora configs for all Raspberry Pi Revisions
 [all]
 # Enable UART
@@ -35,23 +58,24 @@ gpu_mem=32
 # Use eXtended firmware by default
 start_x=1
 
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+audio_pwm_mode=2
+
+# Automatically load overlays for detected cameras
+camera_auto_detect=1
+
+# Automatically load overlays for detected DSI displays
+display_auto_detect=1
+
 # Stop the RPi turning on HDMI monitors on reboot
 hdmi_ignore_cec_init=1
 
-# New option to allow the firmware to load upstream dtb
-# Will allow things like camera, touchscreen etc to work OOTB
-upstream_kernel=1
-
 # HAT and DT overlays. Documentation at Raspberry Pi here:
 # https://www.raspberrypi.org/documentation/configuration/device-tree.md
 # Each dtoverlay line is an individual HAT/overlay, multiple lines allowed
 # dtoverlay=rpi-sense
 
-# Other options you can adjust for all Raspberry Pi Revisions
-# https://www.raspberrypi.org/documentation/configuration/config-txt/README.md
-# All options documented at http://elinux.org/RPiconfig
-# for more options see http://elinux.org/RPi_config.txt
-
 # To use this on Fedora you need to use firmware provided device tree, not kernel
 # For this functionality follow the following guide:
 # https://fedoraproject.org/w/index.php?title=Architectures/ARM/Raspberry_Pi/HATs