]> git.sur5r.net Git - u-boot/commitdiff
RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)
authorStefan Roese <sr@denx.de>
Wed, 20 Aug 2008 18:29:38 +0000 (20:29 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 25 Aug 2008 21:32:39 +0000 (23:32 +0200)
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@denx.de>
drivers/rtc/Makefile

index 2af3ee5cfe52a12cde5da38138924d5a4cda0238..86f855faab7d84e3e910361c75b8a500833451e6 100644 (file)
@@ -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