[coreboot-gerrit] Patch set updated for coreboot: Fix leaking CONFIG_VGA=y

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14823

-gerrit

commit 5c9245d5123af9d8f32b593d9ad7fb789838c9f3
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon May 16 14:49:57 2016 +0300

    Fix leaking CONFIG_VGA=y
    
    Items under DEVICE_SPECIFIC_OPTIONS got selected without
    the driver being selected.
    
    Change-Id: I1797fa6175620a9291873559a6308eaea85a090e
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/drivers/aspeed/ast2050/Kconfig        | 5 +----
 src/drivers/aspeed/common/Kconfig         | 7 -------
 src/drivers/xgi/common/Kconfig            | 7 -------
 src/drivers/xgi/z9s/Kconfig               | 5 +----
 src/northbridge/intel/sandybridge/Kconfig | 1 +
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/drivers/aspeed/ast2050/Kconfig b/src/drivers/aspeed/ast2050/Kconfig
index f110d58..088d258 100644
--- a/src/drivers/aspeed/ast2050/Kconfig
+++ b/src/drivers/aspeed/ast2050/Kconfig
@@ -1,12 +1,9 @@
 config DRIVERS_ASPEED_AST2050
 	bool
+	select DRIVERS_ASPEED_AST_COMMON
 
 if DRIVERS_ASPEED_AST2050
 
-config DEVICE_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select DRIVERS_ASPEED_AST_COMMON
-
 config NATIVE_VGA_INIT_USE_EDID
 	bool
 	default n
diff --git a/src/drivers/aspeed/common/Kconfig b/src/drivers/aspeed/common/Kconfig
index 0f7056b..653782f 100644
--- a/src/drivers/aspeed/common/Kconfig
+++ b/src/drivers/aspeed/common/Kconfig
@@ -1,10 +1,3 @@
 config DRIVERS_ASPEED_AST_COMMON
 	bool
-
-if !MAINBOARD_DO_NATIVE_VGA_INIT
-
-config DEVICE_SPECIFIC_OPTIONS # dummy
-	def_bool y
 	select VGA
-
-endif # MAINBOARD_DO_NATIVE_VGA_INIT
diff --git a/src/drivers/xgi/common/Kconfig b/src/drivers/xgi/common/Kconfig
index e0ed9d6..a0b6fed 100644
--- a/src/drivers/xgi/common/Kconfig
+++ b/src/drivers/xgi/common/Kconfig
@@ -1,10 +1,3 @@
 config DRIVERS_XGI_Z79_COMMON
 	bool
-
-if !MAINBOARD_DO_NATIVE_VGA_INIT
-
-config DEVICE_SPECIFIC_OPTIONS # dummy
-	def_bool y
 	select VGA
-
-endif # MAINBOARD_DO_NATIVE_VGA_INIT
diff --git a/src/drivers/xgi/z9s/Kconfig b/src/drivers/xgi/z9s/Kconfig
index bae03d7..66cd566 100644
--- a/src/drivers/xgi/z9s/Kconfig
+++ b/src/drivers/xgi/z9s/Kconfig
@@ -1,12 +1,9 @@
 config DRIVERS_XGI_Z9S
 	bool
+	select DRIVERS_XGI_Z79_COMMON
 
 if DRIVERS_XGI_Z9S
 
-config DEVICE_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select DRIVERS_XGI_Z79_COMMON
-
 config NATIVE_VGA_INIT_USE_EDID
 	bool
 	default n
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 64f4a14..0cfdf2b 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -55,6 +55,7 @@ config CACHE_MRC_SIZE_KB
 
 config SANDYBRIDGE_IVYBRIDGE_LVDS
 	def_bool n
+	select VGA
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG