Skip to contentSkip to conversation

drivers/*/Makefile: fix conditional compile rule.

PATCH New Ender.Dai 2 participants 2 messages Apr 22, 2010 – May 5, 2010

Subsystems (2)
USB Framebuffer layer
lore
Share & tools
lore

Ender.Dai

author
#0 lore raw

PATCH 1/1 drivers/*/Makefile: fix conditional compile rule.

Fix conditional compile rule for twl4030.c and videomodes.c.

Signed-off-by Ender.Dai <[email protected]>
---
 drivers/usb/phy/Makefile |    1 -
 drivers/video/Makefile   |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/usb/phy/Makefile +0 -1
index 200b907..f09e55f 100644
@@ -23,7 +23,6 @@ include $(TOPDIR)/config.mk
 LIB	:= $(obj)libusb_phy.a
 
 COBJS-$(CONFIG_TWL4030_USB) += twl4030.o
-COBJS-y := twl4030.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/video/Makefile +4 -5
index a5e339a..7d84fc7 100644
@@ -25,20 +25,19 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libvideo.a
 
-COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o
+COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o
 COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
 COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o
 COBJS-$(CONFIG_S6E63D6) += s6e63d6.o
 COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
-COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o
-COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o
+COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
+COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
 COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o
 COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
 COBJS-$(CONFIG_SED156X) += sed156x.o
 COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
-COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o
+COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
-COBJS-y += videomodes.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
Signature · 1 line
1.5.6
Applied
#1 lore raw

PATCH 1/1 drivers/*/Makefile: fix conditional compile rule.

Dear "Ender.Dai",

Quoted 7 lines · In message <[email protected]> you wrote:

Fix conditional compile rule for twl4030.c and videomodes.c.

Signed-off-by Ender.Dai <[email protected]>
---
 drivers/usb/phy/Makefile |    1 -
 drivers/video/Makefile   |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

Applied, thanks.

It would have been better to split this into two commits, one for the USB and the other one for the video custodian.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Heavier than air flying machines are impossible.
                    -- Lord Kelvin, President, Royal Society, c. 1895