From 29e9c32e32f8e947f51a3efe375dab3ef8e1987e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 31 Oct 2023 08:11:53 +0000 Subject: coreboot/default: use alternative heap size fix My previous fix to revert didn't fix S3 on GM45, one of the platforms reported fixed by 78263; I'm merging that instead, at patch set 10. It is referenced by 78815/1 which was split from it, so merge that too (restores overrides of higher values, on certain platforms that we don't use yet). https://review.coreboot.org/c/coreboot/+/78623/10 https://review.coreboot.org/c/coreboot/+/78815/1 Accordingly, update configs to match the new default. Signed-off-by: Leah Rowe --- config/coreboot/x201_8mb/config/libgfxinit_corebootfb | 2 +- config/coreboot/x201_8mb/config/libgfxinit_txtmode | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/coreboot/x201_8mb') diff --git a/config/coreboot/x201_8mb/config/libgfxinit_corebootfb b/config/coreboot/x201_8mb/config/libgfxinit_corebootfb index 8fb6cb51..825e68ec 100644 --- a/config/coreboot/x201_8mb/config/libgfxinit_corebootfb +++ b/config/coreboot/x201_8mb/config/libgfxinit_corebootfb @@ -208,7 +208,6 @@ CONFIG_PCIEXP_ASPM=y # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 -CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 # CONFIG_TPM_MEASURED_BOOT is not set CONFIG_BOARD_ROMSIZE_KB_8192=y @@ -252,6 +251,7 @@ CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 # CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_HEAP_SIZE=0x80000 CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 diff --git a/config/coreboot/x201_8mb/config/libgfxinit_txtmode b/config/coreboot/x201_8mb/config/libgfxinit_txtmode index 5171a640..dd7c154a 100644 --- a/config/coreboot/x201_8mb/config/libgfxinit_txtmode +++ b/config/coreboot/x201_8mb/config/libgfxinit_txtmode @@ -206,7 +206,6 @@ CONFIG_PCIEXP_ASPM=y # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72 -CONFIG_HEAP_SIZE=0x4000 CONFIG_EC_GPE_SCI=0x50 # CONFIG_TPM_MEASURED_BOOT is not set CONFIG_BOARD_ROMSIZE_KB_8192=y @@ -250,6 +249,7 @@ CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 # CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_HEAP_SIZE=0x80000 CONFIG_EHCI_BAR=0xfef00000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 -- cgit v1.2.1