| Message ID | 1437661179-32128-4-git-send-email-nikita@compulab.co.il |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On 07/23/15 17:19, Nikita Kiryanov wrote: > 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> > --- > board/compulab/cm_fx6/cm_fx6.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > 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; >
On 23/07/2015 16:19, Nikita Kiryanov wrote: > 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> > --- > board/compulab/cm_fx6/cm_fx6.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > 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; > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
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;
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> --- board/compulab/cm_fx6/cm_fx6.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)