[U-Boot] build breakage w/recent pulls

When building MPC8572DS_config:

videomodes.o:(.rodata.res_mode_init+0x0): multiple definition of `res_mode_init'
videomodes.o:(.rodata.res_mode_init+0x0): first defined here
videomodes.o: In function `video_get_params':
/local/home/galak/git/u-boot/drivers/video/videomodes.c:160: multiple definition of `video_get_params'
videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:160: first defined here
videomodes.o: In function `video_get_video_mode':
/local/home/galak/git/u-boot/drivers/video/videomodes.c:229: multiple definition of `video_get_video_mode'
videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:229: first defined here
videomodes.o:(.rodata.vesa_modes+0x0): multiple definition of `vesa_modes'
videomodes.o:(.rodata.vesa_modes+0x0): first defined here
make[1]: *** [libvideo.o] Error 1
make: *** [drivers/video/libvideo.o] Error 2
make: *** Waiting for unfinished jobs....

Seems related to:

commit de701d118380de12a48c8a4fb345e9f909329432
Author: Syed Mohammed Khasim <khasim@ti.com>
Date:   Tue Apr 19 14:00:34 2011 -0500

    OMAP3: Add DSS driver for OMAP3
    
    * Supports dynamic panel configuration
    * Supports dynamic tv standard selection
    * Adds support for DSS register access through generic APIs
    * Incorporated DSS register access using structures.
    * DSS makefile update
    
    Previous discussions are here:
    http://www.mail-archive.com/u-boot@lists.denx.de/msg27150.html
    
    Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
…

Add the following change:

U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Dear Kumar Gala,

In message <3E7798A9-6359-44D8-936B-930601A0F560@kernel.crashing.org> you wrote:
>
> Add the following change:

Thanks, but...

> --- a/drivers/video/Makefile
> +++ b/drivers/video/Makefile
> @@ -41,6 +41,8 @@ COBJS-$(CONFIG_SED156X) += sed156x.o
>  COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
>  COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
>  COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
> +COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
> +COBJS-y += videomodes.o

It appears wrong to me to always buiuld and include videomodes, even
for boards that have no video support at all?

Best regards,

Wolfgang Denk

On Sep 4, 2011, at 4:31 PM, Wolfgang Denk wrote:

> Dear Kumar Gala,
> 
> In message <3E7798A9-6359-44D8-936B-930601A0F560@kernel.crashing.org> you wrote:
>> 
>> Add the following change:
> 
> Thanks, but...
> 
>> --- a/drivers/video/Makefile
>> +++ b/drivers/video/Makefile
>> @@ -41,6 +41,8 @@ COBJS-$(CONFIG_SED156X) += sed156x.o
>> COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
>> COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
>> COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
>> +COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
>> +COBJS-y += videomodes.o
> 
> It appears wrong to me to always buiuld and include videomodes, even
> for boards that have no video support at all?
> 
> Best regards,
> 
> Wolfgang Denk

Patch sent to fix

- k