diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-08 08:42:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-08 08:42:51 -0500 |
| commit | 589c659035a44a683b087fd75fe0b7667f7be7f5 (patch) | |
| tree | 4db94ca0e040f387e14069b6f6ec929cad5240ab | |
| parent | 7fed437f4049cb33b28324462c4d1ee2034fa7c0 (diff) | |
| parent | b38fbddbaa3dca0a190f9655f753e72405290431 (diff) | |
| download | u-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.tar.gz u-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.tar.bz2 u-boot-589c659035a44a683b087fd75fe0b7667f7be7f5.zip | |
Merge branch '2022-03-08-assorted-fixes'
- serial uclass fix, mailmap/gitignore updates
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | board/advantech/som-db5800-som-6867/.gitignore | 6 | ||||
| -rw-r--r-- | board/congatec/conga-qeval20-qa3-e3845/.gitignore | 6 | ||||
| -rw-r--r-- | board/intel/bayleybay/.gitignore | 6 | ||||
| -rw-r--r-- | board/intel/edison/.gitignore | 6 | ||||
| -rw-r--r-- | board/intel/galileo/.gitignore | 6 | ||||
| -rw-r--r-- | board/intel/minnowmax/.gitignore | 6 | ||||
| -rw-r--r-- | drivers/serial/serial-uclass.c | 3 |
8 files changed, 21 insertions, 19 deletions
@@ -28,6 +28,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com> Dirk Behme <dirk.behme@googlemail.com> Fabio Estevam <fabio.estevam@nxp.com> Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com> +Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de> Jagan Teki <402jagan@gmail.com> Jagan Teki <jaganna@gmail.com> Jagan Teki <jaganna@xilinx.com> diff --git a/board/advantech/som-db5800-som-6867/.gitignore b/board/advantech/som-db5800-som-6867/.gitignore index 6eb8a5481a..39e46ba0ae 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 6eb8a5481a..39e46ba0ae 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 6eb8a5481a..39e46ba0ae 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 6eb8a5481a..39e46ba0ae 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 6eb8a5481a..39e46ba0ae 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 6eb8a5481a..39e46ba0ae 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 diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 362cedd955..f30f352bd7 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; } |