summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2016-05-16 14:49:57 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2016-05-31 17:18:59 +0200
commit8f3aaa8a4c84b3fc18bee57219b8e2927e996808 (patch)
tree77ecbb06c6e3c7390799e98c4815034f333a4ab4
parentca543396a7338a47bf9578d058c6af4f9d8f8ee2 (diff)
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@gmail.com> Reviewed-on: https://review.coreboot.org/14823 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/drivers/aspeed/ast2050/Kconfig5
-rw-r--r--src/drivers/aspeed/common/Kconfig7
-rw-r--r--src/drivers/xgi/common/Kconfig7
-rw-r--r--src/drivers/xgi/z9s/Kconfig5
-rw-r--r--src/northbridge/intel/sandybridge/Kconfig1
5 files changed, 3 insertions, 22 deletions
diff --git a/src/drivers/aspeed/ast2050/Kconfig b/src/drivers/aspeed/ast2050/Kconfig
index f110d58bf5..088d25879b 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 0f7056b8c7..653782f8f4 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 e0ed9d6baa..a0b6fed53e 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 bae03d718a..66cd56629f 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 64f4a14c3f..0cfdf2b70a 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