[U-Boot] [PATCH] RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)

[U-Boot] [PATCH] RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)

[Stefan Roese]

This "||" doesn't seem to work. So I created 2 lines, one for each config
option. Not sure if this really can be combined into one line in the
Makefile but this approach seems clearer to me. And it works.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 drivers/rtc/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2af3ee5..0c048c5 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -32,8 +32,9 @@ COBJS-y += date.o
 COBJS-$(CONFIG_RTC_DS12887) += ds12887.o
 COBJS-$(CONFIG_RTC_DS1302) += ds1302.o
 COBJS-$(CONFIG_RTC_DS1306) += ds1306.o
-COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o
+COBJS-$(CONFIG_RTC_DS1307) += ds1307.o
 COBJS-$(CONFIG_RTC_DS1337) += ds1337.o
+COBJS-$(CONFIG_RTC_DS1338) += ds1307.o
 COBJS-$(CONFIG_RTC_DS1374) += ds1374.o
 COBJS-$(CONFIG_RTC_DS1556) += ds1556.o
 COBJS-$(CONFIG_RTC_DS164x) += ds164x.o
-- 
1.5.6.5

[U-Boot] [PATCH] RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)

[Scott Wood]

On Wed, Aug 20, 2008 at 02:41:26PM +0200, Stefan Roese wrote:
> This "||" doesn't seem to work. So I created 2 lines, one for each config
> option. Not sure if this really can be combined into one line in the
> Makefile but this approach seems clearer to me. And it works.

Won't you get duplicate symbols if both 1307 and 1338 are enabled?

> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index 2af3ee5..0c048c5 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -32,8 +32,9 @@ COBJS-y += date.o
>  COBJS-$(CONFIG_RTC_DS12887) += ds12887.o
>  COBJS-$(CONFIG_RTC_DS1302) += ds1302.o
>  COBJS-$(CONFIG_RTC_DS1306) += ds1306.o
> -COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o
> +COBJS-$(CONFIG_RTC_DS1307) += ds1307.o
>  COBJS-$(CONFIG_RTC_DS1337) += ds1337.o
> +COBJS-$(CONFIG_RTC_DS1338) += ds1307.o

You could do this:
COBJS-$(CONFIG_RTC_DS1307)$(CONFIG_RTC_DS1338) += ds1307.o
COBJS-y += $(COBJS-yy)

-Scott

[U-Boot] [PATCH] RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)

[Stefan Roese]

On Wednesday 20 August 2008, Scott Wood wrote:
> On Wed, Aug 20, 2008 at 02:41:26PM +0200, Stefan Roese wrote:
> > This "||" doesn't seem to work. So I created 2 lines, one for each config
> > option. Not sure if this really can be combined into one line in the
> > Makefile but this approach seems clearer to me. And it works.
>
> Won't you get duplicate symbols if both 1307 and 1338 are enabled?

Yes, you're right here. I never have seen such a board though, but we should 
prevent this if possible.

> > diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> > index 2af3ee5..0c048c5 100644
> > --- a/drivers/rtc/Makefile
> > +++ b/drivers/rtc/Makefile
> > @@ -32,8 +32,9 @@ COBJS-y += date.o
> >  COBJS-$(CONFIG_RTC_DS12887) += ds12887.o
> >  COBJS-$(CONFIG_RTC_DS1302) += ds1302.o
> >  COBJS-$(CONFIG_RTC_DS1306) += ds1306.o
> > -COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o
> > +COBJS-$(CONFIG_RTC_DS1307) += ds1307.o
> >  COBJS-$(CONFIG_RTC_DS1337) += ds1337.o
> > +COBJS-$(CONFIG_RTC_DS1338) += ds1307.o
>
> You could do this:
> COBJS-$(CONFIG_RTC_DS1307)$(CONFIG_RTC_DS1338) += ds1307.o
> COBJS-y += $(COBJS-yy)

Good idea. Will send an updated patch in a minute.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================