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

[Stefan Roese]

This "||" doesn't seem to work. Now using the idea suggest by Scott Wood
to combine both config options into one line. This even allows defining
both options and not generating the target object twice.

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

diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2af3ee5..86f855f 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -32,7 +32,8 @@ 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)$(CONFIG_RTC_DS1338) += ds1307.o
+COBJS-y += $(COBJS-yy)
 COBJS-$(CONFIG_RTC_DS1337) += ds1337.o
 COBJS-$(CONFIG_RTC_DS1374) += ds1374.o
 COBJS-$(CONFIG_RTC_DS1556) += ds1556.o
--
1.5.6.5

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

[wd]

Dear Stefan Roese,

In message <1219256978-25897-1-git-send-email-sr@...> you wrote:
> This "||" doesn't seem to work. Now using the idea suggest by Scott Wood
> to combine both config options into one line. This even allows defining
> both options and not generating the target object twice.
>
> Signed-off-by: Stefan Roese <sr@...>
> ---
>  drivers/rtc/Makefile |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: [phone] Fax: [phone] Email: wd@...
"Ja, mach' nur einen Plan,    sei nur ein grosses Licht
und mach' dann noch 'nen zweiten Plan,    geh'n tun sie beide nicht."
                                     -- Bert Brecht, Dreigroschenoper
_______________________________________________
U-Boot mailing list
U-Boot@...
http://lists.denx.de/mailman/listinfo/u-boot