diff mbox series

[U-Boot,1/2] board: cm_fx6: Enable DM support for video, fix build error

Message ID 1574243701-14953-1-git-send-email-sunil.m@techveda.org
State Accepted
Commit 7f681b3d75e99b7f64ee7906f2827e22fbadda65
Delegated to: Stefano Babic
Headers show
Series [U-Boot,1/2] board: cm_fx6: Enable DM support for video, fix build error | expand

Commit Message

Suniel Mahesh Nov. 20, 2019, 9:55 a.m. UTC 
From: Suniel Mahesh <sunil.m@techveda.org>

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>
---
 board/compulab/cm_fx6/cm_fx6.c | 5 +++++
 configs/cm_fx6_defconfig       | 1 +
 2 files changed, 6 insertions(+)

Comments

Stefano Babic Dec. 29, 2019, 10:26 a.m. UTC | #1 
> From: Suniel Mahesh <sunil.m@techveda.org>
> 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>
Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index feb7a71..38dca2e 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -146,6 +146,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 a27cdd7..8288095 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -86,4 +86,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