diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-20 20:29:38 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-25 23:32:39 +0200 |
| commit | 4d56e8dea670757c801a6a65531f02a8f981ce1f (patch) | |
| tree | 6fd879ef19a503323fa17f40ddc058c407ed93c7 | |
| parent | 109c30fb8edea1a15d37a6ce787cd5faf33d8e43 (diff) | |
| download | u-boot-imx-4d56e8dea670757c801a6a65531f02a8f981ce1f.zip u-boot-imx-4d56e8dea670757c801a6a65531f02a8f981ce1f.tar.gz u-boot-imx-4d56e8dea670757c801a6a65531f02a8f981ce1f.tar.bz2 | |
RTC: Fix Makefile problem with COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338)
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>
| -rw-r--r-- | 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 |