From f4e8b7efaa085f51603487fc72d44c11995be70f Mon Sep 17 00:00:00 2001 From: Nicholas Chin Date: Thu, 20 Apr 2023 12:13:54 -0600 Subject: Revert "Fix GRUB handling of the E6400 keyboard" This reverts commit 1497ae045104145de677fd151da4de6e92be4e5a. The blanket GRUB patch seems to break PS/2 keyboard handling across other platforms, so revert it. --- .../e6400_16mb/config/libgfxinit_corebootfb | 15 +++------ .../coreboot/e6400_16mb/config/libgfxinit_txtmode | 15 +++------ .../e6400_4mb/config/libgfxinit_corebootfb | 15 +++------ .../coreboot/e6400_4mb/config/libgfxinit_txtmode | 15 +++------ .../e6400_8mb/config/libgfxinit_corebootfb | 15 +++------ .../coreboot/e6400_8mb/config/libgfxinit_txtmode | 15 +++------ .../0005-Fix-PS-2-scancode-set-inconsistency.patch | 39 ---------------------- 7 files changed, 30 insertions(+), 99 deletions(-) delete mode 100644 resources/grub/patches/0005-Fix-PS-2-scancode-set-inconsistency.patch (limited to 'resources') diff --git a/resources/coreboot/e6400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/e6400_16mb/config/libgfxinit_corebootfb index 4649b8ea..fbf03e20 100644 --- a/resources/coreboot/e6400_16mb/config/libgfxinit_corebootfb +++ b/resources/coreboot/e6400_16mb/config/libgfxinit_corebootfb @@ -145,7 +145,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -155,7 +154,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -200,8 +198,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -212,6 +210,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -240,10 +239,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -344,6 +343,7 @@ CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -415,7 +415,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -441,10 +441,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -464,7 +460,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/coreboot/e6400_16mb/config/libgfxinit_txtmode b/resources/coreboot/e6400_16mb/config/libgfxinit_txtmode index c4afe094..4ff5f2f9 100644 --- a/resources/coreboot/e6400_16mb/config/libgfxinit_txtmode +++ b/resources/coreboot/e6400_16mb/config/libgfxinit_txtmode @@ -143,7 +143,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -153,7 +152,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -198,8 +196,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -210,6 +208,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -238,10 +237,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -340,6 +339,7 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -411,7 +411,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -437,10 +437,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -460,7 +456,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb index 6db3ce34..bf8d7c77 100644 --- a/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb +++ b/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb @@ -145,7 +145,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -155,7 +154,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -200,8 +198,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -212,6 +210,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -240,10 +239,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -344,6 +343,7 @@ CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -415,7 +415,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -441,10 +441,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -464,7 +460,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode b/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode index 090887d1..1c8a17ac 100644 --- a/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode +++ b/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode @@ -143,7 +143,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -153,7 +152,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -198,8 +196,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -210,6 +208,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -238,10 +237,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -340,6 +339,7 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -411,7 +411,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -437,10 +437,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -460,7 +456,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/coreboot/e6400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/e6400_8mb/config/libgfxinit_corebootfb index 7a3b4b55..7fe58c05 100644 --- a/resources/coreboot/e6400_8mb/config/libgfxinit_corebootfb +++ b/resources/coreboot/e6400_8mb/config/libgfxinit_corebootfb @@ -145,7 +145,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -155,7 +154,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -200,8 +198,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -212,6 +210,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -240,10 +239,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -344,6 +343,7 @@ CONFIG_LINEAR_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -415,7 +415,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -441,10 +441,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -464,7 +460,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/coreboot/e6400_8mb/config/libgfxinit_txtmode b/resources/coreboot/e6400_8mb/config/libgfxinit_txtmode index caf7467c..758b5bc5 100644 --- a/resources/coreboot/e6400_8mb/config/libgfxinit_txtmode +++ b/resources/coreboot/e6400_8mb/config/libgfxinit_txtmode @@ -143,7 +143,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_DRIVERS_INTEL_WIFI is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400" # CONFIG_HAVE_IFD_BIN is not set CONFIG_PCIEXP_HOTPLUG_BUSES=8 @@ -153,7 +152,6 @@ CONFIG_PS2K_EISAID="PNP0303" CONFIG_PS2M_EISAID="PNP0F13" CONFIG_GFX_GMA_PANEL_1_PORT="LVDS" # CONFIG_DEBUG_SMI is not set -# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set @@ -198,8 +196,8 @@ CONFIG_ROMSTAGE_ADDR=0x2000000 CONFIG_VERSTAGE_ADDR=0x2000000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 -CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X" +CONFIG_EHCI_BAR=0xfef00000 CONFIG_STACK_SIZE=0x2000 CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254 @@ -210,6 +208,7 @@ CONFIG_BOOTBLOCK_IN_CBFS=y CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000 CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 +# CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set CONFIG_FIXED_SMBUS_IO_BASE=0x400 CONFIG_HPET_MIN_TICKS=0x80 @@ -238,10 +237,10 @@ CONFIG_UDELAY_TSC=y CONFIG_TSC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_SETUP_XIP_CACHE=y +CONFIG_LOGICAL_CPUS=y CONFIG_HAVE_SMI_HANDLER=y CONFIG_SMM_TSEG=y CONFIG_SMM_LAPIC_REMAP_MITIGATION=y -CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8 CONFIG_AP_STACK_SIZE=0x800 CONFIG_SMP=y CONFIG_MMX=y @@ -340,6 +339,7 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y +CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_AZALIA_PLUGIN_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x04000000 @@ -411,7 +411,7 @@ CONFIG_GFX_GMA_PCH="No_PCH" CONFIG_GFX_GMA_PANEL_2_PORT="Disabled" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y # CONFIG_USE_PC_CMOS_ALTCENTURY is not set CONFIG_VGA=y @@ -437,10 +437,6 @@ CONFIG_VGA=y # Trusted Platform Module # CONFIG_NO_TPM=y -CONFIG_PCR_BOOT_MODE=1 -CONFIG_PCR_HWID=1 -CONFIG_PCR_SRTM=2 -CONFIG_PCR_RUNTIME_DATA=3 # end of Trusted Platform Module # @@ -460,7 +456,6 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y CONFIG_ACPI_HAVE_PCAT_8259=y CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y CONFIG_ACPI_SOC_NVS=y -CONFIG_ACPI_COMMON_MADT_LAPIC=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y diff --git a/resources/grub/patches/0005-Fix-PS-2-scancode-set-inconsistency.patch b/resources/grub/patches/0005-Fix-PS-2-scancode-set-inconsistency.patch deleted file mode 100644 index 33605840..00000000 --- a/resources/grub/patches/0005-Fix-PS-2-scancode-set-inconsistency.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 14090113f9e0fd67e46de33dad609c1406373ff0 Mon Sep 17 00:00:00 2001 -From: Nicholas Chin -Date: Wed, 19 Apr 2023 13:59:38 -0600 -Subject: [PATCH] Fix PS/2 scancode set inconsistency - -GRUB seems to be expecting set 2 scancodes when built as a coreboot -payload, but PS/2 controllers outputting using set 1 will lead to an -unusable keyboard. Disable the coreboot specific logic which hard codes -the translated set 2 keyboard configuration and let GRUB handle -keyboard init the same way as i386-pc, which did not have this issue. ---- - grub-core/term/at_keyboard.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c -index 597111077..bb251e222 100644 ---- a/grub-core/term/at_keyboard.c -+++ b/grub-core/term/at_keyboard.c -@@ -87,7 +87,7 @@ grub_keyboard_controller_write (grub_uint8_t c) - grub_outb (c, KEYBOARD_REG_DATA); - } - --#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) -+#if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) - #define USE_SCANCODE_SET 1 - #else - #define USE_SCANCODE_SET 0 -@@ -260,7 +260,7 @@ grub_keyboard_controller_init (void) - #if defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) - grub_keyboard_controller_orig = 0; - grub_keyboard_orig_set = 2; --#elif defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_COREBOOT) -+#elif defined (GRUB_MACHINE_QEMU) - /* *BSD relies on those settings. */ - grub_keyboard_controller_orig = KEYBOARD_AT_TRANSLATE; - grub_keyboard_orig_set = 2; --- -2.40.0 - -- cgit v1.2.1