projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imx: make ipu's di configurable
[oweals/u-boot.git]
/
arch
/
arm
/
imx-common
/
video.c
diff --git
a/arch/arm/imx-common/video.c
b/arch/arm/imx-common/video.c
index 0121cd78f27694629b49f50890642a0500a3d27e..549bf9d957a0449559a8ff367bf337c9cd9178a7 100644
(file)
--- a/
arch/arm/imx-common/video.c
+++ b/
arch/arm/imx-common/video.c
@@
-3,17
+3,15
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <asm/imx-common/video.h>
#include <asm/imx-common/video.h>
-extern struct display_info_t const displays[];
-extern size_t display_count;
-
int board_video_skip(void)
{
int i;
int ret;
char const *panel = getenv("panel");
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;
if (!panel) {
for (i = 0; i < display_count; i++) {
struct display_info_t const *dev = displays+i;
@@
-34,11
+32,14
@@
int board_video_skip(void)
break;
}
}
break;
}
}
+
if (i < display_count) {
if (i < display_count) {
- ret = ipuv3_fb_init(&displays[i].mode, 0,
+ ret = ipuv3_fb_init(&displays[i].mode,
displays[i].di ? 1 :
0,
displays[i].pixfmt);
if (!ret) {
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,
printf("Display: %s (%ux%u)\n",
displays[i].mode.name,
displays[i].mode.xres,