UPSTREAM: 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.

BUG=None
BRANCH=None
TEST=None

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>

Change-Id: I92401e892f09fc95d4b3fd7418cdbd10ed033fa8
Reviewed-on: https://chromium-review.googlesource.com/415097
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

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

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