peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

uboot: Att uboot patches for 2025.01

Browse Source 
- Fix CTRL-C misbehave
- Add new command to detect RPI standard display
This commit is contained in:
Mattias Walström
2025-09-07 13:43:25 +02:00
parent 497990a2d3
commit 28d8748bdb
2 changed files with 173 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/uboot/2025.01/0001-hush-Remove-Ctrl-C-detection-in-loops.patch
+41
View File
@@ -0,0 +1,41 @@
From 989ef8436df2ee48d308981098c44b1b8257c23b Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Mon, 10 Jun 2024 13:25:31 +0200
Subject: [PATCH 8/8] hush: Remove Ctrl-C detection in loops
Organization: Addiva Elektronik
Assume that the original intent was to emulate SIGINT to a shell. This
only works as expected if the loop in question is the ouermost, and
last, statement. In all other cases, it completely breaks the expected
execution flow. It more or less resurrects Visual Basic's "On Error
Resume Next".
Disable this behavior and delegate the problem of loop termination to
the writer of the script instead.
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
---
common/cli_hush.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/common/cli_hush.c b/common/cli_hush.c
index 171069f5f4..d6d487893f 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -1796,13 +1796,6 @@ static int run_list_real(struct pipe *pi)
for (; pi; pi = (flag_restore != 0) ? rpipe : pi->next) {
if (pi->r_mode == RES_WHILE || pi->r_mode == RES_UNTIL ||
pi->r_mode == RES_FOR) {
-#ifdef __U_BOOT__
- /* check Ctrl-C */
- ctrlc();
- if ((had_ctrlc())) {
- return 1;
- }
-#endif
flag_restore = 0;
if (!rpipe) {
flag_rep = 0;
--
2.34.1
patches/uboot/2025.01/0002-add-rpidisplay-check.patch
+132
View File
@@ -0,0 +1,132 @@
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1d7ddb4ed36..8572dc4353e 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -176,6 +176,20 @@ config CMD_CPU
internal name) and clock frequency. Other information may be
available depending on the CPU driver.
+config CMD_RPI_DISPLAY
+ bool "rpidisplay"
+ depends on ARCH_BCM283X
+ help
+ Enable commands to detect Raspberry Pi 7" DSI display connection.
+
+ This provides two commands:
+ - rpidisplay: Shows detailed detection information
+ - testrpidisplay: Silent test for use in boot scripts
+
+ Detection is performed by querying the VideoCore GPU for the
+ active display resolution. The official Raspberry Pi 7" DSI
+ display uses 800x480 resolution.
+
config CMD_FWU_METADATA
bool "fwu metadata read"
depends on FWU_MULTI_BANK_UPDATE
diff --git a/cmd/Makefile b/cmd/Makefile
index d1f369deec0..033ea1312ed 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_CMD_CLK) += clk.o
obj-$(CONFIG_CMD_CLS) += cls.o
obj-$(CONFIG_CMD_CONFIG) += config.o
obj-$(CONFIG_CMD_CONITRACE) += conitrace.o
+obj-$(CONFIG_CMD_RPI_DISPLAY) += rpi_display.o
obj-$(CONFIG_CMD_CONSOLE) += console.o
obj-$(CONFIG_CMD_CPU) += cpu.o
obj-$(CONFIG_CMD_DATE) += date.o
@@ -201,7 +202,6 @@ obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o
obj-$(CONFIG_CMD_UFS) += ufs.o
obj-$(CONFIG_CMD_USB) += usb.o disk.o
obj-$(CONFIG_CMD_VIDCONSOLE) += video.o
-
obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o
obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
diff --git a/cmd/rpi_display.c b/cmd/rpi_display.c
new file mode 100644
index 00000000000..07abdc08552
--- /dev/null
+++ b/cmd/rpi_display.c
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Raspberry Pi 7" DSI Display Detection Command
+ * Detects if the official Raspberry Pi 7" DSI display is connected
+ */
+
+#include <command.h>
+#include <asm/arch/msg.h>
+
+static int do_rpi_display(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+ int width, height;
+ int ret;
+
+ printf("=== Raspberry Pi 7\" DSI Display Detection ===\n");
+
+ /* Use official VideoCore mailbox interface to get display resolution */
+ ret = bcm2835_get_video_size(&width, &height);
+ if (ret) {
+ printf("Failed to query VideoCore display size (ret=%d)\n", ret);
+ printf("Display Status: NOT DETECTED\n");
+ return 2;
+ }
+
+ printf("VideoCore reports display: %dx%d", width, height);
+
+ /* Official Raspberry Pi 7" DSI display is 800x480 */
+ if (width == 800 && height == 480) {
+ printf(" - RASPBERRY PI 7\" DSI DISPLAY DETECTED!\n");
+ printf("Display Status: CONNECTED\n");
+ return 0;
+ }
+ /* No resolution could indicate no display */
+ else if (width == 0 || height == 0) {
+ printf(" - No active display\n");
+ printf("Display Status: NOT DETECTED\n");
+ return 1;
+ }
+ else {
+ printf(" - Not Raspberry Pi DSI display (resolution %dx%d)\n", width, height);
+ printf("Display Status: NOT DETECTED\n");
+ return 1;
+ }
+}
+
+static int do_test_rpi_display(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+ int width, height;
+ int ret;
+
+ /* Silent test using VideoCore mailbox interface */
+ ret = bcm2835_get_video_size(&width, &height);
+ if (ret) {
+ return 2; /* Failed to query VideoCore */
+ }
+
+ /* Check for Raspberry Pi DSI display resolutions */
+ if ((width == 800 && height == 480)) {
+ return 0; /* DSI display found */
+ }
+
+ return 1; /* DSI display not found */
+}
+
+U_BOOT_CMD(
+ rpidisplay, 1, 1, do_rpi_display,
+ "detect Raspberry Pi DSI display",
+ "\n"
+ "Detects Raspberry Pi 7\" DSI display by checking resolution:\n"
+ " - 800x480 = Official Raspberry Pi 7\" DSI display\n"
+ "Returns: 0=connected, 1=not detected, 2=no video"
+);
+
+U_BOOT_CMD(
+ testrpidisplay, 1, 1, do_test_rpi_display,
+ "silent test for Raspberry Pi DSI display",
+ "\n"
+ "Silent test for Raspberry Pi DSI display (for use in scripts):\n"
+ "Returns: 0=connected, 1=not detected, 2=no video\n"
+ "Usage: if testrpidisplay; then echo DSI found; fi"
+);