erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: nb/via/cn700: Guard VGA_BIOS_ID appropriately

Browse source 
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).

BUG=none
BRANCH=none
TEST=none

Change-Id: Idea0ab009cc745ce480031f144c8b66c9278198e
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: e8f6569ab3
Original-Change-Id: Ia16a5e6d194191d8da8c551d6eb3849bc65864a9
Original-Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/20101
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/538576
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Nico Huber 2017-06-08 01:22:23 +02:00 • committed by chrome-bot
commit 779950bc87
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/northbridge/via/cn700/Kconfig
View file

@ -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