mx51evk: Fix build error when CONFIG_VIDEO is disabled

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.

---
 board/freescale/mx51evk/Makefile        |    4 +-
 board/freescale/mx51evk/mx51evk.c       |   65 +++---------------------
 board/freescale/mx51evk/mx51evk_video.c |   83 +++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 59 deletions(-)
 create mode 100644 board/freescale/mx51evk/mx51evk_video.c

index 470588e..9ded43f 100644
@@ -23,8 +23,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= mx51evk.o
+COBJS-y	+= mx51evk.o
+COBJS-$(CONFIG_VIDEO)	+= mx51evk_video.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))

1.7.4.1

From: Vikram Narayanan <[email protected]>

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.

---
Changes in v2:
- rebased on current master
- added common file mx5_video.h for function prorotypes

 arch/arm/include/asm/imx-common/mx5_video.h |   21 +++++++
 board/freescale/mx51evk/Makefile            |    4 +-
 board/freescale/mx51evk/mx51evk.c           |   57 +------------------
 board/freescale/mx51evk/mx51evk_video.c     |   81 +++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 56 deletions(-)
 create mode 100644 arch/arm/include/asm/imx-common/mx5_video.h
 create mode 100644 board/freescale/mx51evk/mx51evk_video.c

new file mode 100644
index 0000000..e54c25a
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2012
+ * Anatolij Gustschin, DENX Software Engineering, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+#ifndef __MX5_VIDEO_H
+#define __MX5_VIDEO_H
+
+#ifdef CONFIG_VIDEO
+void lcd_enable(void);
+void setup_iomux_lcd(void);
+#else
+static inline void lcd_enable(void) { }
+static inline void setup_iomux_lcd(void) { }
+#endif
+
+#endif

index 224eaa3..2310fe1 100644
@@ -23,8 +23,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= mx51evk.o
+COBJS-y			+= mx51evk.o
+COBJS-$(CONFIG_VIDEO)	+= mx51evk_video.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 

1.7.5.4

From: Vikram Narayanan <[email protected]>

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.

---
Changes in v2:
- rebased on current master
- added common file mx5_video.h for function prorotypes

 arch/arm/include/asm/imx-common/mx5_video.h |   21 +++++++
 board/freescale/mx51evk/Makefile            |    4 +-
 board/freescale/mx51evk/mx51evk.c           |   57 +------------------
 board/freescale/mx51evk/mx51evk_video.c     |   81 +++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 56 deletions(-)
 create mode 100644 arch/arm/include/asm/imx-common/mx5_video.h
 create mode 100644 board/freescale/mx51evk/mx51evk_video.c

new file mode 100644
index 0000000..e54c25a
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2012
+ * Anatolij Gustschin, DENX Software Engineering, <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ */
+#ifndef __MX5_VIDEO_H
+#define __MX5_VIDEO_H
+
+#ifdef CONFIG_VIDEO
+void lcd_enable(void);
+void setup_iomux_lcd(void);
+#else
+static inline void lcd_enable(void) { }
+static inline void setup_iomux_lcd(void) { }
+#endif
+
+#endif

index 224eaa3..2310fe1 100644
@@ -23,8 +23,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= mx51evk.o
+COBJS-y			+= mx51evk.o
+COBJS-$(CONFIG_VIDEO)	+= mx51evk_video.o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 

1.7.5.4

Hi,

please ignore this patch, it was sent by accident. Sorry about that.

Hi,

Applied to video/master, thanks!

Anatolij