diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-22 16:39:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-22 16:39:01 -0400 |
| commit | 780a17e814503f71d1b51d578b32bc9c89933183 (patch) | |
| tree | 28f94b08a26f0be8d5dde75da601aac8ac5901fb /include/configs | |
| parent | 390183b58179ddaf986422f4d9446c596660f7e0 (diff) | |
| parent | f34e7fc29b32066a8af6c4d22a1f6e0fbfd8e6db (diff) | |
| download | u-boot-780a17e814503f71d1b51d578b32bc9c89933183.zip u-boot-780a17e814503f71d1b51d578b32bc9c89933183.tar.gz u-boot-780a17e814503f71d1b51d578b32bc9c89933183.tar.bz2 | |
Merge tag 'fixes-for-2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-video.git
- fix sunxi LCD clock divider
- fix splash logo with DM_VIDEO and CONFIG_VIDEO_LOGO
- fix splash banner output with DM_VIDEO
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/apalis_imx6.h | 1 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 1 | ||||
| -rw-r--r-- | include/configs/imx6-engicam.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 1 | ||||
| -rw-r--r-- | include/configs/wandboard.h | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4eceb10..c3bc394 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -213,6 +213,7 @@ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "vidargs=mxc_hdmi.only_cea=1 " \ "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index aee9f2f..fa4dc49 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -195,6 +195,7 @@ "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \ "video=mxcfb1:off fbmem=8M\0 " diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 56b3c75..0826195 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -37,6 +37,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "image=uImage\0" \ "fit_image=fit.itb\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c137612..d704cda 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -62,6 +62,7 @@ "dfu_alt_info=spl raw 0x400\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index bdcd5e9..8faf5f0 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -61,6 +61,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ + "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ "fdtfile=undefined\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ |