From 411fce170e46b088abc248098d73f7c6f546e69e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Oct 12 2020 18:38:44 +0000
Subject: Enable UART for all devices to work around firmware boot issues


---

diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index 24ec407..79ad934 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -8,7 +8,7 @@
 
 Name:          bcm283x-firmware
 Version:       20201008
-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
@@ -107,6 +107,9 @@ fi
 %{efi_esp_root}/start4*
 
 %changelog
+* Mon Oct 12 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20201008-2.63b1922
+- Enable UART for all devices to work around firmware boot issues
+
 * Sat Oct 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20201008-1.63b1922
 - Latest firmware update
 
diff --git a/config-64.txt b/config-64.txt
index 7036b08..f325545 100644
--- a/config-64.txt
+++ b/config-64.txt
@@ -5,8 +5,6 @@ kernel=rpi3-u-boot.bin
 # Raspberry Pi 4
 [pi4]
 kernel=rpi4-u-boot.bin
-# Terrible hack to work around U-Boot issues on the RPi4-8G
-enable_uart=1
 
 # Default Fedora configs for all Raspberry Pi Revisions
 [all]
@@ -19,7 +17,9 @@ arm_64bit=1
 # Serial console is ttyS0 on RPi3 and ttyAMA0 on all other variants
 # u-boot will auto detect serial and pass corrent options to kernel if enabled
 # Speed details: https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=141195
-# enable_uart=1
+
+# Terrible hack to work around U-Boot issues on most devices
+enable_uart=1
 
 # Early boot delay in the hope monitors are initialised enough to provide EDID
 bootcode_delay=1
diff --git a/config.txt b/config.txt
index 1b96dae..f4dbbb0 100644
--- a/config.txt
+++ b/config.txt
@@ -9,8 +9,6 @@ kernel=rpi3-u-boot.bin
 # Raspberry Pi 4
 [pi4]
 kernel=rpi4-u-boot.bin
-# Terrible hack to work around U-Boot issues on the RPi4-8G
-enable_uart=1
 
 # Default Fedora configs for all Raspberry Pi Revisions
 [all]
@@ -19,7 +17,9 @@ enable_uart=1
 # Serial console is ttyS0 on RPi3 and ttyAMA0 on all other variants
 # u-boot will auto detect serial and pass corrent options to kernel if enabled
 # Speed details: https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=141195
-# enable_uart=1
+
+# Terrible hack to work around U-Boot issues on most devices
+enable_uart=1
 
 # Early boot delay in the hope monitors are initialised enough to provide EDID
 bootcode_delay=1