diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-18 23:59:16 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-18 23:59:16 +0300 |
| commit | 04909251fdecac9d05e527b83e86e043e8df00ea (patch) | |
| tree | 28457d74af51288b0617623d3042693d7696e62b /board | |
| parent | 83fdb4388253240138e2ce364abe6b070b756d87 (diff) | |
| parent | fb3dd9c005045c2748e30d555d252c6985b97349 (diff) | |
| download | u-boot-04909251fdecac9d05e527b83e86e043e8df00ea.tar.xz | |
Merge tag 'video-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-video into next
- migrate remaining imx5/imx6qd boards to DM_VIDEO
- use 'vidconsole' stdout in nitrogen6x upgrade script
- add option for selection of the vidconsole commands
lcdputs and setcurs
- allow building ipuv3 driver with disabled CONFIG_PANEL
- make backlight and panel drivers optional
- remove useless code from ipuv3 driver
- extend existing DM_VIDEO work-around for console name
to support 'vga'
- remove non-DM code in ipuv3
Diffstat (limited to 'board')
| -rw-r--r-- | board/boundary/nitrogen6x/6x_upgrade.txt | 2 | ||||
| -rw-r--r-- | board/congatec/cgtqmx6eval/cgtqmx6eval.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/boundary/nitrogen6x/6x_upgrade.txt b/board/boundary/nitrogen6x/6x_upgrade.txt index 1a62bbf12e..cd3c33e407 100644 --- a/board/boundary/nitrogen6x/6x_upgrade.txt +++ b/board/boundary/nitrogen6x/6x_upgrade.txt @@ -1,4 +1,4 @@ -setenv stdout serial,vga +setenv stdout serial,vidconsole echo "check U-Boot" ; setenv offset 0x400 if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 044cefd979..392a3f8f1d 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -627,6 +627,11 @@ int board_video_skip(void) return 0; } +int ipu_displays_init(void) +{ + return board_video_skip(); +} + static void setup_display(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; |