diff options
author | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
commit | 45043cf804763d4cf93fec93d8294e385f87622a (patch) | |
tree | 6f8153477648689f4143c317449891818b78b5e6 /arch/arm/imx-common/video.c | |
parent | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (diff) | |
parent | 05d492a3235df397da6200294ea2a802749372a8 (diff) | |
download | u-boot-imx-45043cf804763d4cf93fec93d8294e385f87622a.zip u-boot-imx-45043cf804763d4cf93fec93d8294e385f87622a.tar.gz u-boot-imx-45043cf804763d4cf93fec93d8294e385f87622a.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/video.c')
-rw-r--r-- | arch/arm/imx-common/video.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index 8651b80..46f8a1e 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -11,6 +11,7 @@ int board_video_skip(void) int i; int ret; char const *panel = getenv("panel"); + if (!panel) { for (i = 0; i < display_count; i++) { struct display_info_t const *dev = displays+i; @@ -31,11 +32,14 @@ int board_video_skip(void) break; } } + if (i < display_count) { ret = ipuv3_fb_init(&displays[i].mode, 0, displays[i].pixfmt); if (!ret) { - displays[i].enable(displays+i); + if (displays[i].enable) + displays[i].enable(displays + i); + printf("Display: %s (%ux%u)\n", displays[i].mode.name, displays[i].mode.xres, |