From ac1cab288d5b58085c0f07b8690a6084c0003fc0 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 21 Jan 2023 15:15:01 +0300 Subject: x230edp_12mb: Correct the path to data.vbt --- ...lenovo-x230-fix-the-data.vbt-path-for-the-EDP-varian.patch | 11 +++++------ resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb | 2 +- resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'resources') diff --git a/resources/coreboot/default/patches/0016-lenovo-x230-fix-the-data.vbt-path-for-the-EDP-varian.patch b/resources/coreboot/default/patches/0016-lenovo-x230-fix-the-data.vbt-path-for-the-EDP-varian.patch index 0d85eeb2..b803047f 100644 --- a/resources/coreboot/default/patches/0016-lenovo-x230-fix-the-data.vbt-path-for-the-EDP-varian.patch +++ b/resources/coreboot/default/patches/0016-lenovo-x230-fix-the-data.vbt-path-for-the-EDP-varian.patch @@ -8,19 +8,18 @@ Subject: [PATCH 16/17] lenovo/x230: fix the data.vbt path for the EDP variant 1 file changed, 3 deletions(-) diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig -index b8cae24199..d72b6f8aea 100644 +index b8cae24199..409892f3ab 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig -@@ -62,9 +62,6 @@ config MAINBOARD_PART_NUMBER - config OVERRIDE_DEVICETREE +@@ -63,7 +63,7 @@ config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" --config INTEL_GMA_VBT_FILE + config INTEL_GMA_VBT_FILE - default "variants/x230_edp/data.vbt" if BOARD_LENOVO_X230_EDP -- ++ default "src/mainboard/\$(MAINBOARDDIR)/variants/x230_edp/data.vbt" if BOARD_LENOVO_X230_EDP + config USBDEBUG_HCD_INDEX int - default 2 -- 2.25.1 diff --git a/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb b/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb index b61cbc59..1a647175 100644 --- a/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb +++ b/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb @@ -117,7 +117,7 @@ CONFIG_DEVICETREE="devicetree.cb" # CONFIG_VGA_BIOS is not set CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" CONFIG_DRAM_RESET_GATE_GPIO=10 -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" +CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/x230_edp/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 CONFIG_POST_IO=y CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode b/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode index f7d8049d..72d18d3e 100644 --- a/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode +++ b/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode @@ -117,7 +117,7 @@ CONFIG_DEVICETREE="devicetree.cb" # CONFIG_VGA_BIOS is not set CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" CONFIG_DRAM_RESET_GATE_GPIO=10 -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" +CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/x230_edp/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 CONFIG_POST_IO=y CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" -- cgit v1.2.1