[coreboot-gerrit] New patch to review for coreboot: Build system: Update HAVE_CMOS_DEFAULT

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17454

-gerrit

commit 589e438b652f06ad6691b748215e132b627da416
Author: Martin Roth <martinroth at google.com>
Date:   Wed Nov 16 15:45:22 2016 -0700

    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 at google.com>
---
 src/arch/x86/Kconfig              | 1 +
 src/drivers/pc80/rtc/Makefile.inc | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index e117deb..cd5f8e5 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 7d8ed50..5edb59b 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