GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2016-01-04 12:43:22 -07:00
parent 331c722dd7
commit f812c44f00
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainboard/google/cyan/Kconfig
View File

@ -60,13 +60,18 @@ config VBOOT_REFCODE_INDEX
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
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_GOOGLE_CYAN

17
src/mainboard/intel/strago/Kconfig
View File

@ -50,11 +50,18 @@ config MAINBOARD_VENDOR
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

15
src/soc/intel/braswell/Makefile.inc
View File

@ -43,7 +43,6 @@ ramstage-y += tsc_freq.c
# Remove as ramstage gets fleshed out
ramstage-y += placeholders.c
smm-y += lpc_init.c
smm-y += pmutil.c
smm-y += smihandler.c
@ -58,4 +57,16 @@ CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp1_1/braswell
CPPFLAGS_common += -I3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)
endif
ifneq ($(CONFIG_GOP_SUPPORT),y)
ifneq ($(CONFIG_VGA_BIOS_FILE),)
#we will assume that the vbios names will remain as they are now: vgabios.bin and vgabios_c0.bin
BRASWELL_C0_VBIOS= $(subst .bin,_c0.bin,$(call strip_quotes,$(CONFIG_VGA_BIOS_FILE)))
cbfs-files-$(CONFIG_VGA_BIOS) += pci8086,22b1.rom
pci8086,22b1.rom-file := $(BRASWELL_C0_VBIOS)
pci8086,22b1.rom-type := optionrom
endif # ifneq ($(CONFIG_GOP_SUPPORT),y)
endif # ifneq ($(CONFIG_VGA_BIOS_FILE),)
endif # ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)