Re-integrate "USE_OPTION_TABLE" code.

Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com>
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/Kconfig b/src/Kconfig
index afddca9..fd1ed1a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -83,6 +83,7 @@
 config USE_OPTION_TABLE
 	bool "Use CMOS for configuration values"
 	default n
+	depends on HAVE_OPTION_TABLE
 	help
 	  Enable this option if coreboot shall read options from the "CMOS"
 	  NVRAM instead of using hard coded values.
@@ -189,13 +190,17 @@
 	bool
 	default n
 
+config USE_OPTION_TABLE
+	bool
+	default n
+
 config HAVE_OPTION_TABLE
 	bool
-	default y
+	default n
 	help
 	  This variable specifies whether a given board has a cmos.layout
 	  file containing NVRAM/CMOS bit definitions.
-	  It defaults to 'y' but can be changed to 'n' in mainboard/*/Kconfig.
+	  It defaults to 'n' but can be selected in mainboard/*/Kconfig.
 
 config PIRQ_ROUTE
 	bool