From c8a695550f819b8c61c8f8a13d622402ef684f99 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 16 Jan 2024 17:04:55 +0000 Subject: Reland "Kconfig: Bring HEAP_SIZE to a common, large value" This reverts commit acbc4912375085a099c2427def464d6e481f2a90. Reason for revert: CB:79525 fixes the issue that led to the revert by not maintaining the heap in the SMM-stored copy of ramstage at all. Change-Id: I3c8ef785486d275c9341859d34fce12253bd2bb9 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/80023 Reviewed-by: Sean Rhodes Reviewed-by: Subrata Banik Reviewed-by: Julius Werner Reviewed-by: Matt DeVillier Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/soc/intel/alderlake/Kconfig | 5 ----- src/soc/intel/apollolake/Kconfig | 4 ---- src/soc/intel/cannonlake/Kconfig | 4 ---- src/soc/intel/elkhartlake/Kconfig | 4 ---- src/soc/intel/jasperlake/Kconfig | 4 ---- src/soc/intel/meteorlake/Kconfig | 5 ----- src/soc/intel/skylake/Kconfig | 4 ---- src/soc/intel/tigerlake/Kconfig | 4 ---- src/soc/intel/xeon_sp/Kconfig | 4 ---- src/soc/intel/xeon_sp/cpx/Kconfig | 4 ---- src/soc/intel/xeon_sp/skx/Kconfig | 4 ---- src/soc/intel/xeon_sp/spr/Kconfig | 4 ---- 12 files changed, 50 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index fd95f9e06c..e63bcd2228 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -216,11 +216,6 @@ config IED_REGION_SIZE hex default 0x400000 -config HEAP_SIZE - hex - default 0x80000 if BMP_LOGO - default 0x10000 - config GFX_GMA_DEFAULT_MMIO default 0xaf000000 if MAINBOARD_HAS_EARLY_LIBGFXINIT diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index b22382b18e..aef9d85234 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -255,10 +255,6 @@ config IFWI_FILE_NAME help Name of file to store in the IFWI region. -config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 6 diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index a506b1ba59..92a99c43a3 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -177,10 +177,6 @@ config IED_REGION_SIZE hex default 0x400000 -config HEAP_SIZE - hex - default 0x8000 - config NHLT_DMIC_1CH_16B bool depends on ACPI_NHLT diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 7f1c767379..3361c0ddb9 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -104,10 +104,6 @@ config IED_REGION_SIZE hex default 0x0 -config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 7 diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 624e362954..9f70177ce6 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -106,10 +106,6 @@ config IED_REGION_SIZE hex default 0x400000 -config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 8 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 6dd62732e2..a47176917a 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -199,11 +199,6 @@ config IED_REGION_SIZE hex default 0x400000 -config HEAP_SIZE - hex - default 0x80000 if BMP_LOGO - default 0x10000 - # Intel recommends reserving the PCIe TBT root port resources as below: # - 42 buses # - 194 MiB Non-prefetchable memory diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index d6a11363ee..e0df501460 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -151,10 +151,6 @@ config EXCLUDE_NATIVE_SD_INTERFACE help If you set this option to n, will not use native SD controller. -config HEAP_SIZE - hex - default 0x80000 - config IED_REGION_SIZE hex default 0x400000 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 2c4715a113..2d5cf08a48 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -152,10 +152,6 @@ config IED_REGION_SIZE config INTEL_TME default n -config HEAP_SIZE - hex - default 0x10000 - config MAX_ROOT_PORTS int default 24 if SOC_INTEL_TIGERLAKE_PCH_H diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index 09310300dc..db3e5ad5eb 100644 --- a/src/soc/intel/xeon_sp/Kconfig +++ b/src/soc/intel/xeon_sp/Kconfig @@ -94,10 +94,6 @@ config ECAM_MMCONF_BUS_NUMBER config ALWAYS_ALLOW_ABOVE_4G_ALLOCATION default y -config HEAP_SIZE - hex - default 0x80000 - config HPET_MIN_TICKS hex default 0x80 diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig index f54f7716b6..ac166c3038 100644 --- a/src/soc/intel/xeon_sp/cpx/Kconfig +++ b/src/soc/intel/xeon_sp/cpx/Kconfig @@ -71,10 +71,6 @@ config CPU_MICROCODE_CBFS_LEN hex default 0x7C00 -config HEAP_SIZE - hex - default 0x80000 - config STACK_SIZE hex default 0x4000 diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig index c2c3d4e2e8..5d843878e1 100644 --- a/src/soc/intel/xeon_sp/skx/Kconfig +++ b/src/soc/intel/xeon_sp/skx/Kconfig @@ -55,10 +55,6 @@ config CPU_MICROCODE_CBFS_LEN hex default 0x7C00 -config HEAP_SIZE - hex - default 0x80000 - config IED_REGION_SIZE hex default 0x400000 diff --git a/src/soc/intel/xeon_sp/spr/Kconfig b/src/soc/intel/xeon_sp/spr/Kconfig index 5a21f47b43..bb88becaa7 100644 --- a/src/soc/intel/xeon_sp/spr/Kconfig +++ b/src/soc/intel/xeon_sp/spr/Kconfig @@ -80,10 +80,6 @@ config CPU_MICROCODE_CBFS_LEN hex default 0x8c00 -config HEAP_SIZE - hex - default 0x80000 - config STACK_SIZE hex default 0x4000 -- cgit v1.2.3