diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-09-11 18:14:29 -0300 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2013-11-22 17:29:18 +0800 |
| commit | 1d2be1755d646c2ed853c6e4ec9d24f5657bb41d (patch) | |
| tree | 1f8a17760f54305ce74ebd67547276a89c4e87f0 | |
| parent | 627aee6bd0538d496bd63ab7c5b4506148f29399 (diff) | |
| download | u-boot-imx-1d2be1755d646c2ed853c6e4ec9d24f5657bb41d.zip u-boot-imx-1d2be1755d646c2ed853c6e4ec9d24f5657bb41d.tar.gz u-boot-imx-1d2be1755d646c2ed853c6e4ec9d24f5657bb41d.tar.bz2 | |
mx6sabresd: Avoid hang when HDMI cable is not connected
Since commit d9b894603 (mx6sabresd: Add LVDS splash screen support) the
following hang happens if the HDMI cable is not connected or the 'panel'
variable is not set:
U-Boot 2013.10-rc2-12978-g47ac53d-dirty (Sep 11 2013 - 15:07:38)
CPU: Freescale i.MX6Q rev1.2 at 792 MHz
Reset cause: POR
Board: MX6-SabreSD
DRAM: 1 GiB
MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
...
Provide a check to 'dev->detect' in order to prevent the hang.
Reported-by: Pardeep Kumar Singla <b45784@freescale.com>
Suggested-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
(cherry picked from commit 1601ba4d1e9711e9259ea563b3a2ee1c7c4b3f36)
Signed-off-by: Jason Liu <r64343@freescale.com>
(cherry picked from commit 858b14ecdf63632d054ae971af0bfa33350e43dc)
| -rw-r--r-- | board/freescale/mx6qsabresd/mx6qsabresd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 4bdfea3..13c8bc2 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -899,7 +899,7 @@ int board_video_skip(void) if (!panel) { for (i = 0; i < ARRAY_SIZE(displays); i++) { struct display_info_t const *dev = displays+i; - if (dev->detect(dev)) { + if (dev->detect && dev->detect(dev)) { panel = dev->mode.name; printf("auto-detected panel %s\n", panel); break; |