summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2015-07-23 17:19:30 +0300
committerStefano Babic <sbabic@denx.de>2015-08-02 10:51:37 +0200
commit33299499492586b8af3c6fa930b3122cd9293039 (patch)
tree7f7c54c852203ebab10d3cdae61c91c8a1c3709c /board
parent4377859aa697ebec8e2ddb1cefe2ce338cd73f65 (diff)
downloadu-boot-imx-33299499492586b8af3c6fa930b3122cd9293039.zip
u-boot-imx-33299499492586b8af3c6fa930b3122cd9293039.tar.gz
u-boot-imx-33299499492586b8af3c6fa930b3122cd9293039.tar.bz2
arm: mx6: cm-fx6: add support for displaytype env var
Add support for selecting display preset using the environment variable "displaytype". This is a preparation for future merging of compulab omap3_display.c display selection code with the cm-fx6 display selection code. The "panel" environment variable is retained for backwards compatibility. Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'board')
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 2fb8db5..3e518c1 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -95,7 +95,10 @@ int board_video_skip(void)
{
int ret;
struct display_info_t *preset;
- char const *panel = getenv("panel");
+ char const *panel = getenv("displaytype");
+
+ if (!panel) /* Also accept panel for backward compatibility */
+ panel = getenv("panel");
if (!panel)
return -ENOENT;