From 06b20ceb2ffa19c064b1dd4ccb9eb6ffe3ba41be Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 8 Mar 2021 11:44:19 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51341 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel Reviewed-by: Felix Held --- src/mainboard/amd/padmelon/Kconfig | 4 +++- src/mainboard/google/zork/Kconfig | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig index 5507a3ee05..b286665813 100644 --- a/src/mainboard/amd/padmelon/Kconfig +++ b/src/mainboard/amd/padmelon/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select SUPERIO_FINTEK_COMMON_PRE_RAM select SUPERIO_FINTEK_FAN_CONTROL select SUPERIO_FINTEK_FAN_API_CALL - select VGA_BIOS select AZALIA_PLUGIN_SUPPORT config MAINBOARD_DIR @@ -49,6 +48,9 @@ config IRQ_SLOT_COUNT int default 11 +config VGA_BIOS + default y if USE_AMD_BLOBS + config HWM_PORT hex default 0x0225 diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index fe22650925..06bb7278cd 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_PICASSO select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF - select VGA_BIOS select BOARD_ROMSIZE_KB_16384 select DRIVERS_AMD_I2S_MACHINE_DEV select DISABLE_SPI_FLASH_ROM_SHARING @@ -105,6 +104,9 @@ config ONBOARD_VGA_IS_PRIMARY bool default y +config VGA_BIOS + default y if USE_AMD_BLOBS + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH