summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-09-11 18:14:29 -0300
committerStefano Babic <sbabic@denx.de>2013-09-20 17:55:36 +0200
commit1601ba4d1e9711e9259ea563b3a2ee1c7c4b3f36 (patch)
treee319eba6c6df5c34a0687176c01ca71b8170e020 /board
parentb4c927b33d520102deb19c318986695a8b19b467 (diff)
downloadu-boot-imx-1601ba4d1e9711e9259ea563b3a2ee1c7c4b3f36.zip
u-boot-imx-1601ba4d1e9711e9259ea563b3a2ee1c7c4b3f36.tar.gz
u-boot-imx-1601ba4d1e9711e9259ea563b3a2ee1c7c4b3f36.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>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6sabresd/mx6sabresd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index c832bd9..0f91fe2 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -313,7 +313,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;