intel/braswell: Build in both C0 and 'other' vbios
The Braswell CPU seems to have two different Video BIOS roms, one for
the C0 revision, and one for other revisions. Build them both into
the coreboot image, and let coreboot sort out which one should be used
at runtime. This should allow one rom to be used for all revisions.
The initial reason for this patch was that the Kconfig symbol
C0_DISP_SUPPORT didn't exist, and was causing issues. This
seems like the best way to eliminate the need for that symbol.
Change-Id: I5b9f225c0daf4e02fda75daf9cd07bb160bf0e0f
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12826
Tested-by: build bot (Jenkins)
Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index facd97f..3c12ece 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -50,11 +50,18 @@
if !GOP_SUPPORT
config VGA_BIOS_FILE
string
- default "3rdparty/blobs/mainboard/intel/strago/vgabios_c0.bin" if C0_DISP_SUPPORT
- default "3rdparty/blobs/mainboard/intel/strago/vgabios.bin" if !C0_DISP_SUPPORT
+ default "3rdparty/blobs/mainboard/intel/strago/vgabios.bin"
+ help
+ The C0 version of the video bios gets computed from this name
+ so that they can both be added. Only the correct one for the
+ system will be run.
+
config VGA_BIOS_ID
string
- default "8086,22b1" if C0_DISP_SUPPORT
- default "8086,22b0" if !C0_DISP_SUPPORT
-endif # GOP_SUPPORT
+ default "8086,22b0"
+ help
+ The VGA_BIOS_ID for the C0 version of the video bios is hardcoded
+ in soc/intel/braswell/Makefile.inc as 8086,22b1
+
+endif #GOP_SUPPORT
endif # BOARD_INTEL_STRAGO