From e8f6569ab3944a7d6645a38f03acaf38852612be Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Thu, 8 Jun 2017 01:22:23 +0200 Subject: [PATCH] nb/via/cn700: Guard VGA_BIOS_ID appropriately This was the single spot where VGA_BIOS_ID wasn't guarded by anything. It resulted in the wrong default id if we didn't chose to add a VGA BIOS at first but added one later (e.g. a board provided default guarded by VGA_BIOS wasn't applied then, because the Via/CN700 value was already set). Change-Id: Ia16a5e6d194191d8da8c551d6eb3849bc65864a9 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/20101 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/northbridge/via/cn700/Kconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig index 4491e6235b..1619ff15a3 100644 --- a/src/northbridge/via/cn700/Kconfig +++ b/src/northbridge/via/cn700/Kconfig @@ -27,6 +27,8 @@ config CN700_VIDEO_MB_128MB endchoice +if NORTHBRIDGE_VIA_CN700 + config VIDEO_MB int default 0 if CN700_VIDEO_MB_OFF @@ -35,8 +37,10 @@ config VIDEO_MB default 32 if CN700_VIDEO_MB_32MB default 64 if CN700_VIDEO_MB_64MB default 128 if CN700_VIDEO_MB_128MB - depends on NORTHBRIDGE_VIA_CN700 config VGA_BIOS_ID string + depends on VGA_BIOS default "1106,3344" + +endif