From 26ce9af9a04ae282ff7c186eac0476f13a37cfa0 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Mon, 22 May 2017 13:22:09 +0200 Subject: device/Kconfig: Introduce MAINBOARD_FORCE_NATIVE_VGA_INIT MAINBOARD_FORCE_NATIVE_VGA_INIT is to be selected instead of the user option MAINBOARD_DO_NATIVE_VGA_INIT. The distinction is necessary to use the latter in a choice. Change-Id: I689aa5cadea9e1091180fd38b1dc093c6938d69c Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19813 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/daisy/Kconfig | 2 +- src/mainboard/google/gru/Kconfig | 2 +- src/mainboard/google/oak/Kconfig | 2 +- src/mainboard/google/peach_pit/Kconfig | 2 +- src/mainboard/google/slippy/Kconfig | 2 +- src/mainboard/google/smaug/Kconfig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig index 5311e37c86..7a939057b2 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER config VBOOT diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 3a30013de9..75da54d9f0 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS select EC_GOOGLE_CHROMEEC_RTC select EC_GOOGLE_CHROMEEC_SPI select HAVE_HARD_RESET - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_NATIVE_VGA_INIT select RAM_CODE_SUPPORT diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index a4a34b273e..ede32e0f3c 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER select MAINBOARD_HAS_CHROMEOS select RAM_CODE_SUPPORT diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index fead669613..70fbd1ae99 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC_SPI select BOARD_ROMSIZE_KB_4096 select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER select DRIVER_PARADE_PS8625 diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index cfae4e4733..1d889df97e 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -22,7 +22,7 @@ if BOARD_GOOGLE_BASEBOARD_SLIPPY config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select VBOOT_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index 344be282dc..06c1cba35e 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_FORCE_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_WINBOND select SOC_NVIDIA_TEGRA210 -- cgit v1.2.3