diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-06-04 16:07:51 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-06-19 13:43:32 +0200 |
commit | 71ad5dd6bbc05dc7aae5e7527716e3f95a0d5ba7 (patch) | |
tree | 1eb1b76d6d8242ef767fb5010ac5b0196a66242d /recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch | |
parent | cf24e18cc50c2f0cab6b44fd3f03fa39cfca4e9f (diff) |
u-boot: update to v2019.07-rc4+
Add patches currently on the ML targeting Toradex boards and fetch
latest and greatest of master branch.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch')
-rw-r--r-- | recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch b/recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch new file mode 100644 index 0000000..c3014fa --- /dev/null +++ b/recipes-bsp/u-boot-mainline/files/0004-colibri-imx6ull-support-building-with-DM_VIDEO-y.patch @@ -0,0 +1,44 @@ +From 501c39b579c901989d6ef6f4463bb5ea1572fa09 Mon Sep 17 00:00:00 2001 +From: Igor Opaniuk <igor.opaniuk@toradex.com> +Date: Wed, 19 Jun 2019 11:47:08 +0300 +Subject: [PATCH 4/6] colibri-imx6ull: support building with DM_VIDEO=y + +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 b221e118fa..37bd78ea2e 100644 +--- a/include/configs/colibri-imx6ull.h ++++ b/include/configs/colibri-imx6ull.h +@@ -172,7 +172,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.13.6 + |