From 7af9953463c65fe2f02704e6bce815d830e58d7d Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 14 Nov 2022 00:51:12 +0000
Subject: pragmatic system distribution guideline compliance

osboot is now part of libreboot, and will soon shut down.
libreboot now conforms to osboot policy.
---
 .../coreboot/t60_intelgpu/config/libgfxinit_corebootfb      | 13 ++++++++++---
 resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode   | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'resources/coreboot/t60_intelgpu/config')

diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 5f5ab3a6..f0d7869b 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
@@ -137,6 +137,9 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
+CONFIG_PCIEXP_HOTPLUG_BUSES=8
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_S230U is not set
@@ -277,10 +280,11 @@ CONFIG_SMP=y
 CONFIG_MMX=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
+CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
+CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
-CONFIG_CPU_MICROCODE_CBFS_NONE=y
+# CONFIG_CPU_MICROCODE_CBFS_NONE is not set
 
 #
 # Northbridge
@@ -294,7 +298,7 @@ CONFIG_I945_LVDS=y
 # Southbridge
 #
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_PCIEXP_HOTPLUG is not set
+CONFIG_PCIEXP_HOTPLUG=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -383,6 +387,9 @@ CONFIG_ECAM_MMCONF_LENGTH=0x04000000
 CONFIG_PCI_ALLOW_BUS_MASTER=y
 CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index 34b0bbd3..8107efbd 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
@@ -137,6 +137,9 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
+CONFIG_PCIEXP_HOTPLUG_BUSES=8
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_S230U is not set
@@ -277,10 +280,11 @@ CONFIG_SMP=y
 CONFIG_MMX=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
+CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
+CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
-CONFIG_CPU_MICROCODE_CBFS_NONE=y
+# CONFIG_CPU_MICROCODE_CBFS_NONE is not set
 
 #
 # Northbridge
@@ -294,7 +298,7 @@ CONFIG_I945_LVDS=y
 # Southbridge
 #
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_PCIEXP_HOTPLUG is not set
+CONFIG_PCIEXP_HOTPLUG=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -381,6 +385,9 @@ CONFIG_ECAM_MMCONF_LENGTH=0x04000000
 CONFIG_PCI_ALLOW_BUS_MASTER=y
 CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-- 
cgit v1.2.1