From 45eb35c1979e928a2b086b090be86ac249114e62 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 7 Mar 2022 08:41:21 +0100 Subject: .mailmap: Fix Heinrich's xypron.glpk@gmx.de record There is one issue with Heinrich xypron.glpk@gmx.de record which should be specifically grouped with his name. Signed-off-by: Michal Simek --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 36fc1164a2b..1f88ea953ce 100644 --- a/.mailmap +++ b/.mailmap @@ -28,6 +28,7 @@ Boris Brezillon Dirk Behme Fabio Estevam Heinrich Schuchardt +Heinrich Schuchardt xypron.glpk@gmx.de Jagan Teki <402jagan@gmail.com> Jagan Teki Jagan Teki -- cgit v1.2.3 From c12f9d2e5496489c22aa265725cc71697d2de0cb Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 21 Feb 2022 22:17:37 +0100 Subject: drivers: serial: Make sure we really return a serial device The stdout-path property in the device tree does not necessarily point at a serial device. On machines such as the Apple M1 laptops where the serial port isn't easy to access and users expect to see console output on the integrated display stdout-path may point at the device tree node for the framebuffer for example. If stdout-path does not point at a node for a serial device, the serial_check_stdout() will not find a bound device and will drop down into code that attempts to use lists_bind_fdt() to bind a device anyway. However, that fallback code does not check that the uclass of the device is UCLASS_SERIAL. So if stdout-path points at the framebuffer instead of the serial device it will return a UCLASS_VIDEO device. Since the code that calls this function expects the returned device to be a UCLASS_SERIAL device, U-Boot will crash as soon as it attempts to send output to the console. Add a check here to verify that the uclass of the bound device really is UCLASS_SERIAL. If it isn't, serial_check_stdout() will return an error and serial_find_console_or_panic() will use the serial device with sequence number 0 as the console and all is fine. Signed-off-by: Mark Kettenis Reviewed-by: Simon Glass --- drivers/serial/serial-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 362cedd9552..f30f352bd7a 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -66,7 +66,8 @@ static int serial_check_stdout(const void *blob, struct udevice **devp) */ if (node > 0 && !lists_bind_fdt(gd->dm_root, offset_to_ofnode(node), devp, NULL, false)) { - if (!device_probe(*devp)) + if (device_get_uclass_id(*devp) == UCLASS_SERIAL && + !device_probe(*devp)) return 0; } -- cgit v1.2.3 From b38fbddbaa3dca0a190f9655f753e72405290431 Mon Sep 17 00:00:00 2001 From: Philippe Reynes Date: Tue, 8 Mar 2022 10:37:19 +0100 Subject: board: .gitignore: replace dsdt.c by dsdt_generated.c Since commit 5d94cbd1dca7 ("scripts: Makefile.lib: generate dsdt_generated.c instead of dsdt.c"), the file generated is named dsdt_generated.c instead of dsdt.c. So all files .gitignore referencing dsdt.c should be upated with dsdt_generated.c. Signed-off-by: Philippe Reynes Reviewed-by: Heinrich Schuchardt --- board/advantech/som-db5800-som-6867/.gitignore | 6 +++--- board/congatec/conga-qeval20-qa3-e3845/.gitignore | 6 +++--- board/intel/bayleybay/.gitignore | 6 +++--- board/intel/edison/.gitignore | 6 +++--- board/intel/galileo/.gitignore | 6 +++--- board/intel/minnowmax/.gitignore | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/board/advantech/som-db5800-som-6867/.gitignore b/board/advantech/som-db5800-som-6867/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/advantech/som-db5800-som-6867/.gitignore +++ b/board/advantech/som-db5800-som-6867/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c diff --git a/board/congatec/conga-qeval20-qa3-e3845/.gitignore b/board/congatec/conga-qeval20-qa3-e3845/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/.gitignore +++ b/board/congatec/conga-qeval20-qa3-e3845/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c diff --git a/board/intel/bayleybay/.gitignore b/board/intel/bayleybay/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/intel/bayleybay/.gitignore +++ b/board/intel/bayleybay/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c diff --git a/board/intel/edison/.gitignore b/board/intel/edison/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/intel/edison/.gitignore +++ b/board/intel/edison/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c diff --git a/board/intel/galileo/.gitignore b/board/intel/galileo/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/intel/galileo/.gitignore +++ b/board/intel/galileo/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c diff --git a/board/intel/minnowmax/.gitignore b/board/intel/minnowmax/.gitignore index 6eb8a5481ab..39e46ba0ae7 100644 --- a/board/intel/minnowmax/.gitignore +++ b/board/intel/minnowmax/.gitignore @@ -1,3 +1,3 @@ -dsdt.aml -dsdt.asl.tmp -dsdt.c +dsdt_generated.aml +dsdt_generated.asl.tmp +dsdt_generated.c -- cgit v1.2.3