summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-11-16 15:45:22 -0700
committerMartin Roth <martinroth@google.com>2016-11-28 18:58:15 +0100
commitf76303e29e257d23710ac30c2bdb3679a7ad5a52 (patch)
treeff5b7ac419e186ff66c8946343ac1c64f91e85ba
parent3c20906e42ed5bf7ef5202fa9eb38c574e43b688 (diff)
downloadcoreboot-f76303e29e257d23710ac30c2bdb3679a7ad5a52.tar.xz
Build system: Update HAVE_CMOS_DEFAULT
- Don't build the cmos.default file into cbfs if USE_OPTION_TABLE isn't specified. - Don't allow HAVE_CMOS_DEFAULT if HAVE_OPTION_TABLE isn't set. Change-Id: I92401e892f09fc95d4b3fd7418cdbd10ed033fa8 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/17454 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/arch/x86/Kconfig1
-rw-r--r--src/drivers/pc80/rtc/Makefile.inc2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index e117deb924..cd5f8e5180 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -149,6 +149,7 @@ config BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP
config HAVE_CMOS_DEFAULT
def_bool n
+ depends on HAVE_OPTION_TABLE
config CMOS_DEFAULT_FILE
string
diff --git a/src/drivers/pc80/rtc/Makefile.inc b/src/drivers/pc80/rtc/Makefile.inc
index 7d8ed50589..5edb59bb1a 100644
--- a/src/drivers/pc80/rtc/Makefile.inc
+++ b/src/drivers/pc80/rtc/Makefile.inc
@@ -6,9 +6,11 @@ romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_early.c
ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
+ifeq ($(CONFIG_USE_OPTION_TABLE),y)
cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool
cmos.default-type = cmos_default
+endif
smm-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c