Skip to contentSkip to conversation

mx53loco: Fix build error when CONFIG_VIDEO is disabled

U-Boot Superseded Vikram Narayanan 2 participants 3 messages Jun 18, 2012 – Nov 14, 2012

lore
Share & tools
lore
#0 lore raw

The inclusion of LCD patch into mx51evk breaks the build when CONFIG_VIDEO is disabled. Fix this by splitting the video related stuff to a new file.

Also rename the function lcd_iomux to setup_iomux_lcd to make the namings aligned with the other iomux functions.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
---
 board/freescale/mx53loco/Makefile         |    4 +-
 board/freescale/mx53loco/mx53loco.c       |   78 ++---------------------
 board/freescale/mx53loco/mx53loco_video.c |   96 +++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 72 deletions(-)
 create mode 100644 board/freescale/mx53loco/mx53loco_video.c
board/freescale/mx53loco/Makefile +3 -1
index a6ea939..f92c928 100644
@@ -22,8 +22,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= mx53loco.o
+COBJS-y	+= mx53loco.o
+COBJS-$(CONFIG_VIDEO) += mx53loco_video.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
board/freescale/mx53loco/mx53loco.c +7 -71

108 lines not on this page · raw message

board/freescale/mx53loco/mx53loco_video.c new file +96 -0

96 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#1 lore raw

PATCH v2 1/1 mx53loco: Fix build error when CONFIG_VIDEO is disabled

From: Vikram Narayanan <[email protected]>

The inclusion of LCD patch into mx53loco breaks the build when CONFIG_VIDEO is disabled. Fix this by splitting the video related stuff to a new file.

Also rename the function lcd_iomux to setup_iomux_lcd to make the namings aligned with the other iomux functions.

---
Changes in v2:
- rebased on current master
- revised commit log

 board/freescale/mx53loco/Makefile         |    4 +-
 board/freescale/mx53loco/mx53loco.c       |   66 +-------------------
 board/freescale/mx53loco/mx53loco_video.c |   94 +++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 65 deletions(-)
 create mode 100644 board/freescale/mx53loco/mx53loco_video.c
board/freescale/mx53loco/Makefile +3 -1
index 8bc69a9..3be17c5 100644
@@ -22,8 +22,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= mx53loco.o
+COBJS-y			+= mx53loco.o
+COBJS-$(CONFIG_VIDEO)	+= mx53loco_video.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
board/freescale/mx53loco/mx53loco.c +2 -64

82 lines not on this page · raw message

board/freescale/mx53loco/mx53loco_video.c new file +94 -0

94 lines not on this page · raw message

Signature · 1 line
1.7.5.4
#2 lore raw

PATCH v2 1/1 mx53loco: Fix build error when CONFIG_VIDEO is disabled

Hi,

Quoted 18 lines · On Sat, 10 Nov 2012 13:32:46 +0100 Anatolij Gustschin <[email protected]> wrote:

From: Vikram Narayanan <[email protected]>

The inclusion of LCD patch into mx53loco breaks the build when CONFIG_VIDEO is disabled. Fix this by splitting the video related stuff to a new file.

Also rename the function lcd_iomux to setup_iomux_lcd to make the namings aligned with the other iomux functions.

---
Changes in v2:
- rebased on current master
- revised commit log

Quoted 5 lines
 board/freescale/mx53loco/Makefile         |    4 +-
 board/freescale/mx53loco/mx53loco.c       |   66 +-------------------
 board/freescale/mx53loco/mx53loco_video.c |   94 +++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 65 deletions(-)
 create mode 100644 board/freescale/mx53loco/mx53loco_video.c

Applied to video/master, thanks!

Anatolij