0002-raspberrypi-Disable-simple-framebuffer-support.patch

From 553b7bf556b9efffccf992c2a071b5082130d038 Mon Sep 17 00:00:00 2001
From: Alexandru Costache <alexandru@balena.io>
Date: Wed, 9 Mar 2022 16:23:17 +0100
Subject: [PATCH] raspberrypi: Disable simple framebuffer support

On 4.19 kernels this u-boot driver clashes with bcm2708_fb.
So let's disable it from here so that we have bcm2708_fb
enabled in the kernel, just as Raspbian users might expect.
See https://github.com/raspberrypi/linux/issues/3139

Upstream-Status: Inappropriate [configuration]
Signed-off-by: Florin Sarbu <florin@balena.io>
---
 board/raspberrypi/rpi/rpi.c | 2 ++
 common/Makefile             | 2 +-
 include/configs/rpi.h       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 372b26b6f2..255f4a174f 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -500,8 +500,10 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	int node;
 
 	node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
+	/*
 	if (node < 0)
 		lcd_dt_simplefb_add_node(blob);
+	*/
 
 #ifdef CONFIG_EFI_LOADER
 	/* Reserve the spin table */
diff --git a/common/Makefile b/common/Makefile
index ae0430c35f..ab427c70b4 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -49,7 +49,7 @@ ifndef CONFIG_DM_VIDEO
 obj-$(CONFIG_LCD) += lcd.o lcd_console.o
 endif
 obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
-obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
+//obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
 obj-$(CONFIG_LYNXKDI) += lynxkdi.o
 obj-$(CONFIG_MENU) += menu.o
 obj-$(CONFIG_UPDATE_COMMON) += update.o
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index da3888a731..8c14faa8e7 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -71,8 +71,8 @@
 /* GPIO */
 #define CONFIG_BCM2835_GPIO
 /* LCD */
-#define CONFIG_LCD_DT_SIMPLEFB
-#define CONFIG_VIDEO_BCM2835
+//#define CONFIG_LCD_DT_SIMPLEFB
+//#define CONFIG_VIDEO_BCM2835
 
 /* DFU over USB/UDC */
 #ifdef CONFIG_CMD_DFU
-- 
2.17.1