mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-08 18:38:33 +00:00
3d793dc7ef
Since 0001-CMD-read-string-from-fileinto-env.patch is in the global directory to be applied for U-Boot, drop it from the Raspberry Pi specific patch directory.
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
From 8c11937b388dfafcdff27914d361532dc805245f Mon Sep 17 00:00:00 2001
|
|
Message-Id: <8c11937b388dfafcdff27914d361532dc805245f.1619686343.git.stefan@agner.ch>
|
|
In-Reply-To: <76cd0b31510f2019e411593e1a177ca8280b56b3.1619686343.git.stefan@agner.ch>
|
|
References: <76cd0b31510f2019e411593e1a177ca8280b56b3.1619686343.git.stefan@agner.ch>
|
|
From: Florin Sarbu <florin@balena.io>
|
|
Date: Thu, 12 Sep 2019 12:31:31 +0200
|
|
Subject: [PATCH 2/2] 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, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
|
index df52a4689f..bda53d8b25 100644
|
|
--- a/board/raspberrypi/rpi/rpi.c
|
|
+++ b/board/raspberrypi/rpi/rpi.c
|
|
@@ -502,7 +502,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
|
|
* should be more intelligent, and e.g. only do this if no enabled DT
|
|
* node exists for the "real" graphics driver.
|
|
*/
|
|
- lcd_dt_simplefb_add_node(blob);
|
|
+ //lcd_dt_simplefb_add_node(blob);
|
|
|
|
#ifdef CONFIG_EFI_LOADER
|
|
/* Reserve the spin table */
|
|
diff --git a/common/Makefile b/common/Makefile
|
|
index daeea67cf2..09ddab0b4e 100644
|
|
--- a/common/Makefile
|
|
+++ b/common/Makefile
|
|
@@ -50,7 +50,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 834f1cd236..19a0d611c4 100644
|
|
--- a/include/configs/rpi.h
|
|
+++ b/include/configs/rpi.h
|
|
@@ -65,8 +65,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
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
#define CONFIG_TFTP_TSIZE
|
|
--
|
|
2.31.1
|
|
|