summaryrefslogtreecommitdiff
path: root/board/toradex/colibri_imx7/colibri_imx7.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-09-18 10:42:12 -0400
committerTom Rini <trini@konsulko.com>2020-09-18 10:42:12 -0400
commit98f3ee09d096c6c1bc49e08d805f6354dffb0e59 (patch)
treeb02cd94de7fc93381d8ce7d07481ff9952986218 /board/toradex/colibri_imx7/colibri_imx7.c
parent9de3126e80cdac7ee15b6671065a952184533dda (diff)
parent4516b535bf16db4231ea27bb95197d869f86893b (diff)
Merge tag 'u-boot-imx-20200918' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
---------------------------------------------------------------- Fixes for 2020.10 ----------------- - Toradex boards - mx6qsabrelite: fix env offset - esdhc_imx: waiting for clock instead of sleep - dyn RAM calibration for entry point i.MX6 Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/728274602
Diffstat (limited to 'board/toradex/colibri_imx7/colibri_imx7.c')
-rw-r--r--board/toradex/colibri_imx7/colibri_imx7.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 14df3fc42c..8afe1bfd5e 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -133,8 +133,10 @@ static int setup_lcd(void)
*/
void board_preboot_os(void)
{
+#ifdef CONFIG_DM_VIDEO
gpio_direction_output(GPIO_PWM_A, 1);
gpio_direction_output(GPIO_BL_ON, 0);
+#endif
}
static void setup_iomux_uart(void)
@@ -356,8 +358,6 @@ int board_late_init(void)
{
#if defined(CONFIG_DM_VIDEO)
setup_lcd();
-
- show_boot_logo();
#endif
return 0;
}