From ee3da7ef37010037acf7ecbe1bce1aa6b997c1cd Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 27 Nov 2021 14:21:31 +0000
Subject: [PATCH] rpi-firmware: update to 20211127

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/common/aarch64/rpi-firmware | 2 ++
 config/rootfiles/common/armv6l/rpi-firmware  | 4 +++-
 config/rpi-firmware/config.txt               | 2 ++
 lfs/rpi-firmware                             | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/common/aarch64/rpi-firmware b/config/rootfiles/common/aarch64/rpi-firmware
index b48e117b42..9c5c2fe284 100644
--- a/config/rootfiles/common/aarch64/rpi-firmware
+++ b/config/rootfiles/common/aarch64/rpi-firmware
@@ -1,5 +1,7 @@
 #boot/LICENCE.broadcom
 boot/bcm2711-rpi-4-b.dtb
+boot/bcm2711-rpi-400.dtb
+boot/bcm2711-rpi-cm4.dtb
 boot/bootcode.bin
 boot/config.txt
 boot/fixup.dat
diff --git a/config/rootfiles/common/armv6l/rpi-firmware b/config/rootfiles/common/armv6l/rpi-firmware
index b48e117b42..5147c542ff 100644
--- a/config/rootfiles/common/armv6l/rpi-firmware
+++ b/config/rootfiles/common/armv6l/rpi-firmware
@@ -1,5 +1,7 @@
 #boot/LICENCE.broadcom
-boot/bcm2711-rpi-4-b.dtb
+#boot/bcm2711-rpi-4-b.dtb
+#boot/bcm2711-rpi-400.dtb
+#boot/bcm2711-rpi-cm4.dtb
 boot/bootcode.bin
 boot/config.txt
 boot/fixup.dat
diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt
index cd74ef3309..b281323355 100644
--- a/config/rpi-firmware/config.txt
+++ b/config/rpi-firmware/config.txt
@@ -3,6 +3,7 @@
 # Raspberry Pi - Videocore configuration file
 #
 ###############################################################################
+enable_uart=1
 
 ###############################################################################
 #
@@ -21,6 +22,7 @@ gpu_mem=16
 #
 # hdmi_drive: 0 auto, 1 DVI (no Sound), 2 HDMI (Sound)
 #hdmi_drive=1
+hdmi_safe=1
 #
 # sdtv_mode: 0 NTSC, 1 NTSC (JP), 3 PAL, 4 PAL (Brazil)
 #sdtv_mode=2
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index b4a9bdef7e..52614e332a 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20210606
+VER        = 20211127
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5e9cccb9df460ea870134578e6caab26
+$(DL_FILE)_MD5 = d2cfb86cc19638683cd6ae042cc1eec5
 
 install : $(TARGET)
 
-- 
2.39.2