From 1619ed3a0d5d7a3dbda50f12a96639f48bb6e3bb Mon Sep 17 00:00:00 2001 From: Philipp Deppenwiese Date: Thu, 19 Jan 2017 22:43:45 +0100 Subject: [PATCH] UPSTREAM: configs/builder: Remove pre-defined VGA bios file Removes the pre-defined VGA bios file and id because the build system includes every vgabios. Also make the VGA output primary by default BUG=none BRANCH=none TEST=none Change-Id: I851d602b470b1f0b504d07d5fe70fd58f20ae1a8 Signed-off-by: Patrick Georgi Original-Commit-Id: 5c765ceff9060d11e7b3b712528ad65ba0149dac Original-Change-Id: I87d52ef2d1e151c6e54beba64316fe9043668158 Original-Signed-off-by: Philipp Deppenwiese Original-Reviewed-on: https://review.coreboot.org/18181 Original-Reviewed-by: Martin Roth Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Reviewed-on: https://chromium-review.googlesource.com/430617 Commit-Ready: Aaron Durbin Tested-by: Aaron Durbin Reviewed-by: Aaron Durbin --- configs/builder/config.lenovo_t420 | 3 +-- configs/builder/config.lenovo_t420s | 3 +-- configs/builder/config.lenovo_t430s | 3 +-- configs/builder/config.lenovo_t520 | 3 +-- configs/builder/config.lenovo_t530 | 3 +-- configs/builder/config.lenovo_x220 | 3 +-- configs/builder/config.lenovo_x220i | 3 +-- configs/builder/config.lenovo_x230 | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/configs/builder/config.lenovo_t420 b/configs/builder/config.lenovo_t420 index bb653b353c..e4e4b9b2a4 100644 --- a/configs/builder/config.lenovo_t420 +++ b/configs/builder/config.lenovo_t420 @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0126.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_t420s b/configs/builder/config.lenovo_t420s index c6eff36037..7593b7a740 100644 --- a/configs/builder/config.lenovo_t420s +++ b/configs/builder/config.lenovo_t420s @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0126.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_t430s b/configs/builder/config.lenovo_t430s index 177b527382..b21dbbaf07 100644 --- a/configs/builder/config.lenovo_t430s +++ b/configs/builder/config.lenovo_t430s @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0166.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_t520 b/configs/builder/config.lenovo_t520 index dcdaa5e5c0..1d7816e909 100644 --- a/configs/builder/config.lenovo_t520 +++ b/configs/builder/config.lenovo_t520 @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0126.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_t530 b/configs/builder/config.lenovo_t530 index f1da9ea5e0..0106bbc22a 100644 --- a/configs/builder/config.lenovo_t530 +++ b/configs/builder/config.lenovo_t530 @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0106.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_x220 b/configs/builder/config.lenovo_x220 index fddd4bc29e..da5a474277 100644 --- a/configs/builder/config.lenovo_x220 +++ b/configs/builder/config.lenovo_x220 @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0126.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_x220i b/configs/builder/config.lenovo_x220i index a4b6a9d898..5612f5b22e 100644 --- a/configs/builder/config.lenovo_x220i +++ b/configs/builder/config.lenovo_x220i @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0116.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/builder/config.lenovo_x230 b/configs/builder/config.lenovo_x230 index 183aaad596..d897f44ec8 100644 --- a/configs/builder/config.lenovo_x230 +++ b/configs/builder/config.lenovo_x230 @@ -1,8 +1,6 @@ CONFIG_USE_OPTION_TABLE=y CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y -CONFIG_VGA_BIOS=y -CONFIG_VGA_BIOS_FILE="site-local/pci8086,0166.rom" CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_ME_BIN=y CONFIG_DRIVERS_PS2_KEYBOARD=y @@ -17,3 +15,4 @@ CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_LPC_TPM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_NONE=y +CONFIG_ONBOARD_VGA_IS_PRIMARY=y