From c36af7b00a9854f626894e51fd28c9df6f1e4e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 18 Nov 2014 12:41:16 +0200 Subject: Replace includes of build.h with version.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As build.h is an auto-generated file it was necessary to add it as an explicit prerequisite in the Makefiles. When this was forgotten abuild would sometimes fail with following error: fatal error: build.h: No such file or directory Fix this error by compiling version.c into all stages. Change-Id: I342f341077cc7496aed279b00baaa957aa2af0db Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7510 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/drivers/pc80/Makefile.inc | 3 --- src/drivers/pc80/mc146818rtc.c | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc index a60033bbcb..fe6d11fd36 100644 --- a/src/drivers/pc80/Makefile.inc +++ b/src/drivers/pc80/Makefile.inc @@ -18,6 +18,3 @@ cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool cmos.default-type = 0xaa smm-y += mc146818rtc.c - -$(obj)/drivers/pc80/mc146818rtc.ramstage.o : $(obj)/build.h -$(obj)/drivers/pc80/mc146818rtc.smm.o : $(obj)/build.h diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c index 9670e9ce6b..014a8c9402 100644 --- a/src/drivers/pc80/mc146818rtc.c +++ b/src/drivers/pc80/mc146818rtc.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -17,11 +17,12 @@ static void cmos_update_date(u8 has_century) cmos_write(0, RTC_CLK_SECOND); cmos_write(0, RTC_CLK_MINUTE); cmos_write(1, RTC_CLK_HOUR); - cmos_write(COREBOOT_BUILD_WEEKDAY_BCD + 1, RTC_CLK_DAYOFWEEK); - cmos_write(COREBOOT_BUILD_DAY_BCD, RTC_CLK_DAYOFMONTH); - cmos_write(COREBOOT_BUILD_MONTH_BCD, RTC_CLK_MONTH); - cmos_write(COREBOOT_BUILD_YEAR_BCD, RTC_CLK_YEAR); - if (has_century) cmos_write(0x20, RTC_CLK_ALTCENTURY); + cmos_write(coreboot_build_date.weekday + 1, RTC_CLK_DAYOFWEEK); + cmos_write(coreboot_build_date.day, RTC_CLK_DAYOFMONTH); + cmos_write(coreboot_build_date.month, RTC_CLK_MONTH); + cmos_write(coreboot_build_date.year, RTC_CLK_YEAR); + if (has_century) + cmos_write(coreboot_build_date.century, RTC_CLK_ALTCENTURY); } #if CONFIG_USE_OPTION_TABLE -- cgit v1.2.3