mb/{amd/padmelon,google/zork}: Do not select `VGA_BIOS`

The VGA BIOS for AMD Padmelon and Google Zork are stored in `amd_blobs`.
Do not force inclusion of VGA BIOS when `USE_AMD_BLOBS` is not enabled.

Change-Id: I206e8fadc14ec0d9b162dc4d72813fdd3d43958b
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51341
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Angel Pons 2021-03-08 11:44:19 +01:00 committed by Martin Roth
parent 83f9f8983b
commit 06b20ceb2f
2 changed files with 6 additions and 2 deletions

View File

@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
select SUPERIO_FINTEK_COMMON_PRE_RAM select SUPERIO_FINTEK_COMMON_PRE_RAM
select SUPERIO_FINTEK_FAN_CONTROL select SUPERIO_FINTEK_FAN_CONTROL
select SUPERIO_FINTEK_FAN_API_CALL select SUPERIO_FINTEK_FAN_API_CALL
select VGA_BIOS
select AZALIA_PLUGIN_SUPPORT select AZALIA_PLUGIN_SUPPORT
config MAINBOARD_DIR config MAINBOARD_DIR
@ -49,6 +48,9 @@ config IRQ_SLOT_COUNT
int int
default 11 default 11
config VGA_BIOS
default y if USE_AMD_BLOBS
config HWM_PORT config HWM_PORT
hex hex
default 0x0225 default 0x0225

View File

@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_COMMON_BLOCK_USE_ESPI
select SOC_AMD_PICASSO select SOC_AMD_PICASSO
select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF
select VGA_BIOS
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DRIVERS_AMD_I2S_MACHINE_DEV select DRIVERS_AMD_I2S_MACHINE_DEV
select DISABLE_SPI_FLASH_ROM_SHARING select DISABLE_SPI_FLASH_ROM_SHARING
@ -105,6 +104,9 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
config VGA_BIOS
default y if USE_AMD_BLOBS
config VBOOT config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_LID_SWITCH select VBOOT_LID_SWITCH