Message ID | 20190619084710.19074-5-igor.opaniuk@gmail.com |
---|---|
State | Accepted |
Commit | 9de5eb23dc7972b9e382327b9a485335b24d3b4a |
Delegated to: | Anatolij Gustschin |
Headers | show |
Series | Enabled DM_VIDEO for Colibri iMX7 NAND/iMX6ULL | expand |
+ Oleksandr On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > 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 >
On Thu, 11 Jul 2019 at 11:59, Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > + Oleksandr > > On Wed, Jun 19, 2019 at 11:47 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > > > 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 > > > > > -- > Best regards - Freundliche GrĂ¼sse - Meilleures salutations > > Igor Opaniuk > > mailto: igor.opaniuk@gmail.com > skype: igor.opanyuk > +380 (93) 836 40 67 > http://ua.linkedin.com/in/iopaniuk > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
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