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 <sba...@denx.de> > Cc: Igor Grinberg <grinb...@compulab.co.il> > Signed-off-by: Nikita Kiryanov <nik...@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 -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot