From: Igor Opaniuk <igor.opaniuk@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/6] colibri-imx6ull: support building with DM_VIDEO=y
Date: Wed, 19 Jun 2019 11:47:08 +0300 [thread overview]
Message-ID: <20190619084710.19074-5-igor.opaniuk@gmail.com> (raw)
In-Reply-To: <20190619084710.19074-1-igor.opaniuk@gmail.com>
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. This fixes linking issues when building with DM_VIDEO enabled mxsfb
driver.
2. Provide proper defines for both VIDEO=y and DM_VIDEO=y.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
arch/arm/mach-imx/mx6/soc.c | 2 +-
include/configs/colibri-imx6ull.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index e80f1d484b..86a9eeba0c 100644
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -549,7 +549,7 @@ const struct boot_mode soc_boot_modes[] = {
void reset_misc(void)
{
#ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_VIDEO_MXS
+#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO)
lcdif_power_down();
#endif
#endif
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 21d9a3da01..1c6acf0081 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -170,7 +170,7 @@
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#ifdef CONFIG_VIDEO
+#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#define CONFIG_VIDEO_LOGO
--
2.17.1
next prev parent reply other threads:[~2019-06-19 8:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 8:47 [U-Boot] [PATCH 0/6] Enabled DM_VIDEO for Colibri iMX7 NAND/iMX6ULL Igor Opaniuk
2019-06-19 8:47 ` [U-Boot] [PATCH 1/6] video: mxsfb: fix mxsfb fbdev binding issues Igor Opaniuk
2019-07-11 8:56 ` Igor Opaniuk
2019-07-11 9:07 ` Oleksandr Suvorov
2019-06-19 8:47 ` [U-Boot] [PATCH 2/6] ARM: dts: colibri_imx7: Fix lcdif node definition Igor Opaniuk
2019-07-11 8:57 ` Igor Opaniuk
2019-07-11 9:09 ` Oleksandr Suvorov
2019-06-19 8:47 ` [U-Boot] [PATCH 3/6] configs: colibri_imx7: enable DM_VIDEO Igor Opaniuk
2019-07-11 8:57 ` Igor Opaniuk
2019-07-11 9:10 ` Oleksandr Suvorov
2019-06-19 8:47 ` Igor Opaniuk [this message]
2019-07-11 8:57 ` [U-Boot] [PATCH 4/6] colibri-imx6ull: support building with DM_VIDEO=y Igor Opaniuk
2019-07-11 9:16 ` Oleksandr Suvorov
2019-06-19 8:47 ` [U-Boot] [PATCH 5/6] ARM: dts: colibri-imx6ull: extend lcdif node Igor Opaniuk
2019-07-11 8:57 ` Igor Opaniuk
2019-07-11 9:18 ` Oleksandr Suvorov
2019-06-19 8:47 ` [U-Boot] [PATCH 6/6] configs: colibri-imx6ull: switch to DM_VIDEO Igor Opaniuk
2019-07-11 8:58 ` Igor Opaniuk
2019-07-11 9:24 ` Oleksandr Suvorov
2019-07-11 8:56 ` [U-Boot] [PATCH 0/6] Enabled DM_VIDEO for Colibri iMX7 NAND/iMX6ULL Igor Opaniuk
2019-07-11 10:59 ` Igor Opaniuk
2019-07-25 11:13 ` Igor Opaniuk
2019-07-29 9:27 ` Anatolij Gustschin
2019-07-29 10:01 ` Igor Opaniuk
2019-07-29 9:23 ` Anatolij Gustschin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190619084710.19074-5-igor.opaniuk@gmail.com \
--to=igor.opaniuk@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox