summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuniel Mahesh <sunil.m@techveda.org>2019-11-20 15:25:00 +0530
committerStefano Babic <sbabic@denx.de>2020-01-07 10:26:56 +0100
commit7f681b3d75e99b7f64ee7906f2827e22fbadda65 (patch)
treecc71ecdd9b18b906e95e405a004ffe04897504b2
parentc35b19531dd0c283a1b28ae937c764c4be59c8b3 (diff)
downloadu-boot-7f681b3d75e99b7f64ee7906f2827e22fbadda65.tar.gz
board: cm_fx6: Enable DM support for video, fix build error
Enable driver model for Video to remove the following compile warning on CM-FX6 SOM based target: ===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO before the v2019.07 release. ==================================================== This change introduced build error as shown: LD u-boot drivers/built-in.o: In function ipu_displays_init' arm-linux-ld.bfd: BFD (GNU Binutils) 2.29.1 assertion fail elf32-arm.c:9509 Makefile:1621: recipe for target 'u-boot' failed make: *** [u-boot] Error 1 The DM converted video driver calls ipu_displays_init in its probe, which inturn calls relevant board_video_skip. Defining ipu_displays_init in the board file fixes build error. Target was compile tested, build was clean. Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c5
-rw-r--r--configs/cm_fx6_defconfig1
2 files changed, 6 insertions, 0 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index b20ca168df..3e185ad82a 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -147,6 +147,11 @@ int board_video_skip(void)
static inline void cm_fx6_setup_display(void) {}
#endif /* CONFIG_VIDEO_IPUV3 */
+int ipu_displays_init(void)
+{
+ return board_video_skip();
+}
+
#ifdef CONFIG_DWC_AHSATA
static int cm_fx6_issd_gpios[] = {
/* The order of the GPIOs in the array is important! */
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 316cb5725d..ce78cf8931 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -90,4 +90,5 @@ CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
+CONFIG_DM_VIDEO=y
CONFIG_FDT_FIXUP_PARTITIONS=y