Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58398 )
Change subject: device/Kconfig: Drop LINEAR_FRAMEBUFFER kludge ......................................................................
device/Kconfig: Drop LINEAR_FRAMEBUFFER kludge
The linter was fixed, we don't need the workaround anymore and can use LINEAR_FRAMEBUFFER directly inside the choice.
Change-Id: Iead41e26da897a4f2a02d71e8e2678a292e34cb4 Signed-off-by: Nico Huber nico.h@gmx.de --- M configs/config.asrock_b85m_pro4.debug_smmstore_hotplug_gcov_ubsan_em100 M configs/config.asus_p8z77-v_lx2.debug_smmstore_hotplug_yabel_em100 M configs/config.emulation_qemu_x86_i440fx_noserial M configs/config.lenovo_thinkpad_t430_all_debug_and_option_table M configs/config.libretrend_lt1000 M src/device/Kconfig M src/drivers/aspeed/ast2050/ast2050.c M src/drivers/aspeed/common/Kconfig M src/drivers/aspeed/common/Makefile.inc 9 files changed, 12 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/58398/1
diff --git a/configs/config.asrock_b85m_pro4.debug_smmstore_hotplug_gcov_ubsan_em100 b/configs/config.asrock_b85m_pro4.debug_smmstore_hotplug_gcov_ubsan_em100 index d389ac0..bf1cd27 100644 --- a/configs/config.asrock_b85m_pro4.debug_smmstore_hotplug_gcov_ubsan_em100 +++ b/configs/config.asrock_b85m_pro4.debug_smmstore_hotplug_gcov_ubsan_em100 @@ -22,7 +22,7 @@ CONFIG_CONSOLE_POST=y # CONFIG_INTEL_CHIPSET_LOCKDOWN is not set # CONFIG_FINALIZE_USB_ROUTE_XHCI is not set -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_PCIEXP_HOTPLUG=y CONFIG_SMMSTORE=y CONFIG_SMMSTORE_SIZE=0x30000 diff --git a/configs/config.asus_p8z77-v_lx2.debug_smmstore_hotplug_yabel_em100 b/configs/config.asus_p8z77-v_lx2.debug_smmstore_hotplug_yabel_em100 index 167909d..fbd1ab7 100644 --- a/configs/config.asus_p8z77-v_lx2.debug_smmstore_hotplug_yabel_em100 +++ b/configs/config.asus_p8z77-v_lx2.debug_smmstore_hotplug_yabel_em100 @@ -21,7 +21,7 @@ CONFIG_VGA_ROM_RUN=y CONFIG_PCI_OPTION_ROM_RUN_YABEL=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y -CONFIG_VBE_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_PCIEXP_HOTPLUG=y CONFIG_SMMSTORE=y CONFIG_FATAL_ASSERTS=y diff --git a/configs/config.emulation_qemu_x86_i440fx_noserial b/configs/config.emulation_qemu_x86_i440fx_noserial index f71c0ae..70bbfe1 100644 --- a/configs/config.emulation_qemu_x86_i440fx_noserial +++ b/configs/config.emulation_qemu_x86_i440fx_noserial @@ -7,4 +7,4 @@ CONFIG_LINEAR_FRAMEBUFFER=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_BOOTSPLASH=y -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y diff --git a/configs/config.lenovo_thinkpad_t430_all_debug_and_option_table b/configs/config.lenovo_thinkpad_t430_all_debug_and_option_table index cb1da1e..2a0b5fe 100644 --- a/configs/config.lenovo_thinkpad_t430_all_debug_and_option_table +++ b/configs/config.lenovo_thinkpad_t430_all_debug_and_option_table @@ -5,7 +5,7 @@ CONFIG_BOARD_LENOVO_THINKPAD_T430=y CONFIG_BOOTBLOCK_NORMAL=y CONFIG_MAINBOARD_USE_LIBGFXINIT=y -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_DEBUG_RAM_SETUP=y CONFIG_DEBUG_SMBUS=y CONFIG_DEBUG_SMI=y diff --git a/configs/config.libretrend_lt1000 b/configs/config.libretrend_lt1000 index 0d4f543..9373aa7 100644 --- a/configs/config.libretrend_lt1000 +++ b/configs/config.libretrend_lt1000 @@ -1,6 +1,6 @@ CONFIG_VENDOR_LIBRETREND=y CONFIG_BOARD_LIBRETREND_LT1000=y CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y -CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y +CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_TPM2=y CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y diff --git a/src/device/Kconfig b/src/device/Kconfig index ea3e241..1494ec3 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -424,8 +424,8 @@
choice prompt "Framebuffer mode" - default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && WANT_LINEAR_FRAMEBUFFER - default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && WANT_LINEAR_FRAMEBUFFER + default LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && WANT_LINEAR_FRAMEBUFFER + default LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && WANT_LINEAR_FRAMEBUFFER default VGA_TEXT_FRAMEBUFFER
config VGA_TEXT_FRAMEBUFFER @@ -436,7 +436,7 @@ legacy VGA text mode or, if a VGA BIOS is used and a VESA mode set, switch to text mode before handing control to a payload.
-config VBE_LINEAR_FRAMEBUFFER +config LINEAR_FRAMEBUFFER bool "VESA framebuffer" depends on HAVE_VBE_LINEAR_FRAMEBUFFER help @@ -445,7 +445,7 @@ framebuffer entry in its coreboot table and the payload will need a compatible driver.
-config GENERIC_LINEAR_FRAMEBUFFER +config LINEAR_FRAMEBUFFER bool "Linear "high-resolution" framebuffer" depends on HAVE_LINEAR_FRAMEBUFFER help @@ -455,14 +455,6 @@
endchoice
-# Workaround to have LINEAR_FRAMEBUFFER set in both cases -# VBE_LINEAR_FRAMEBUFFER and GENERIC_LINEAR_FRAMEBUFFER. -# `kconfig_lint` doesn't let us use the same name with -# different texts in the choice above. -config LINEAR_FRAMEBUFFER - def_bool y - depends on VBE_LINEAR_FRAMEBUFFER || GENERIC_LINEAR_FRAMEBUFFER - config BOOTSPLASH prompt "Show graphical bootsplash" bool diff --git a/src/drivers/aspeed/ast2050/ast2050.c b/src/drivers/aspeed/ast2050/ast2050.c index 5cb7198..d506ee0 100644 --- a/src/drivers/aspeed/ast2050/ast2050.c +++ b/src/drivers/aspeed/ast2050/ast2050.c @@ -45,7 +45,7 @@
/* if we don't have console, at least print something... */ vga_line_write(0, "ASpeed VGA text mode initialized"); - } else if (CONFIG(GENERIC_LINEAR_FRAMEBUFFER)) { + } else if (CONFIG(LINEAR_FRAMEBUFFER)) { ast_driver_framebuffer_init(&drm_dev, 0); printk(BIOS_INFO, "ASpeed high resolution framebuffer initialized\n"); } diff --git a/src/drivers/aspeed/common/Kconfig b/src/drivers/aspeed/common/Kconfig index 79c4c75..2bdbf22 100644 --- a/src/drivers/aspeed/common/Kconfig +++ b/src/drivers/aspeed/common/Kconfig @@ -3,4 +3,4 @@ select HAVE_LINEAR_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT select VGA if VGA_TEXT_FRAMEBUFFER - select SOFTWARE_I2C if GENERIC_LINEAR_FRAMEBUFFER + select SOFTWARE_I2C if LINEAR_FRAMEBUFFER diff --git a/src/drivers/aspeed/common/Makefile.inc b/src/drivers/aspeed/common/Makefile.inc index 1f4b858..90b397f 100644 --- a/src/drivers/aspeed/common/Makefile.inc +++ b/src/drivers/aspeed/common/Makefile.inc @@ -1,4 +1,4 @@ ifeq ($(CONFIG_DRIVERS_ASPEED_AST_COMMON),y) ramstage-y += ast_dp501.c ast_main.c ast_post.c -ramstage-$(CONFIG_GENERIC_LINEAR_FRAMEBUFFER) += ast_mode.c ast_i2c.c ast_mode_corebootfb.c +ramstage-$(CONFIG_LINEAR_FRAMEBUFFER) += ast_mode.c ast_i2c.c ast_mode_corebootfb.c endif
-
Nico Huber (Code Review)