Attention is currently required from: Arthur Heymans, Christian Walter, Eran Mitrani, Felix Held, Felix Singer, Fred Reitberger, Jakub Czapiga, Jason Glenesk, Johnny Lin, Jonathan Zhang, Julius Werner, Kapil Porwal, Kyösti Mälkki, Lean Sheng Tan, Martin L Roth, Matt DeVillier, Nick Vaccaro, Nico Huber, Philipp Hug, Sean Rhodes, Subrata Banik, Tarun, Tim Chu, Werner Zeh, ron minnich.

Patrick Georgi would like Felix Singer, build bot (Jenkins), Philipp Hug, Eran Mitrani, Jakub Czapiga, Jonathan Zhang, Nick Vaccaro, Arthur Heymans, Kyösti Mälkki, Nico Huber, Sean Rhodes, Subrata Banik, Johnny Lin, Christian Walter, Lean Sheng Tan, Werner Zeh, Fred Reitberger, ron minnich, Felix Held, Tim Chu, Matt DeVillier, Julius Werner, Tarun, Jason Glenesk, Martin L Roth and Kapil Porwal to review this change.

View Change

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
---
M src/Kconfig
M src/cpu/qemu-x86/Kconfig
M src/mainboard/sifive/hifive-unleashed/Kconfig
M src/northbridge/amd/pi/Kconfig
M src/soc/amd/picasso/Kconfig
M src/soc/amd/stoneyridge/Kconfig
M src/soc/cavium/cn81xx/Kconfig
M src/soc/intel/alderlake/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/elkhartlake/Kconfig
M src/soc/intel/jasperlake/Kconfig
M src/soc/intel/meteorlake/Kconfig
M src/soc/intel/skylake/Kconfig
M src/soc/intel/tigerlake/Kconfig
M src/soc/intel/xeon_sp/Kconfig
M src/soc/intel/xeon_sp/cpx/Kconfig
M src/soc/intel/xeon_sp/skx/Kconfig
M src/soc/intel/xeon_sp/spr/Kconfig
M src/soc/qualcomm/ipq40xx/Kconfig
20 files changed, 1 insertion(+), 77 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/80023/1
diff --git a/src/Kconfig b/src/Kconfig
index 02d5d77..4b60c4b 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -751,8 +751,7 @@
 
 config HEAP_SIZE
 	hex
-	default 0x100000 if FLATTENED_DEVICE_TREE
-	default 0x4000
+	default 0x100000
 
 config STACK_SIZE
 	hex
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index f3e2c4c..0fa999e 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -35,7 +35,4 @@
 	default 32 if SMM_TSEG
 	default 4
 
-config HEAP_SIZE
-	default 0x8000
-
 endif
diff --git a/src/mainboard/sifive/hifive-unleashed/Kconfig b/src/mainboard/sifive/hifive-unleashed/Kconfig
index 7f9300f..7bc3b0b 100644
--- a/src/mainboard/sifive/hifive-unleashed/Kconfig
+++ b/src/mainboard/sifive/hifive-unleashed/Kconfig
@@ -10,9 +10,6 @@
 	select FLATTENED_DEVICE_TREE
 	select SPI_SDCARD
 
-config HEAP_SIZE
-	default 0x10000
-
 config MAINBOARD_DIR
 	default "sifive/hifive-unleashed"
 
diff --git a/src/northbridge/amd/pi/Kconfig b/src/northbridge/amd/pi/Kconfig
index 4518db1..4ffe82a 100644
--- a/src/northbridge/amd/pi/Kconfig
+++ b/src/northbridge/amd/pi/Kconfig
@@ -29,8 +29,4 @@
 	hex
 	default 0x200000
 
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 endif # NORTHBRIDGE_AMD_PI
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 796fe4e..c33f287 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -264,10 +264,6 @@
 	bool
 	default n
 
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config SERIRQ_CONTINUOUS_MODE
 	bool
 	default n
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index dadda8d..0cc8ecd 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -157,10 +157,6 @@
 	bool
 	default n
 
-config HEAP_SIZE
-	hex
-	default 0xc0000
-
 config EHCI_BAR
 	hex
 	default 0xfef00000
diff --git a/src/soc/cavium/cn81xx/Kconfig b/src/soc/cavium/cn81xx/Kconfig
index 368581f..77ca972 100644
--- a/src/soc/cavium/cn81xx/Kconfig
+++ b/src/soc/cavium/cn81xx/Kconfig
@@ -30,9 +30,6 @@
 	int
 	default 1
 
-config HEAP_SIZE
-	default 0x10000
-
 config STACK_SIZE
 	default 0x2000
 
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
index 890296d..eea27fc 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -216,11 +216,6 @@
 	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 f8de381..d9e24ce 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -255,10 +255,6 @@
 	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 a506b1b..92a99c4 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -177,10 +177,6 @@
 	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 7f1c767..3361c0d 100644
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@@ -104,10 +104,6 @@
 	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 624e362..9f70177 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -106,10 +106,6 @@
 	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 923a2b4..a2f2706 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -198,11 +198,6 @@
 	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 d6a11363e..e0df501 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -151,10 +151,6 @@
 	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 2c4715a..2d5cf08 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -152,10 +152,6 @@
 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 63ced01..e63bee5 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -91,10 +91,6 @@
 config ECAM_MMCONF_BUS_NUMBER
 	default 256
 
-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 f54f771..ac166c3 100644
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@@ -71,10 +71,6 @@
 	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 c2c3d4e..5d84387 100644
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@@ -55,10 +55,6 @@
 	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 b1c4c78..43b87ad 100644
--- a/src/soc/intel/xeon_sp/spr/Kconfig
+++ b/src/soc/intel/xeon_sp/spr/Kconfig
@@ -79,10 +79,6 @@
 	hex
 	default 0x8c00
 
-config HEAP_SIZE
-	hex
-	default 0x80000
-
 config STACK_SIZE
 	hex
 	default 0x4000
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index 0eabb00..0ce9273 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -57,8 +57,4 @@
 	help
 	  Path for utils to combine SBL_ELF and bootblock
 
-config HEAP_SIZE
-	hex
-	default 0x8000
-
 endif

To view, visit change 80023. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I3c8ef785486d275c9341859d34fce12253bd2bb9
Gerrit-Change-Number: 80023
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <patrick@coreboot.org>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Christian Walter <christian.walter@9elements.com>
Gerrit-Reviewer: Eran Mitrani <mitrani@google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred@gmail.com>
Gerrit-Reviewer: Jakub Czapiga <czapiga@google.com>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk@gmail.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin@wiwynn.com>
Gerrit-Reviewer: Jonathan Zhang <jon.zhixiong.zhang@gmail.com>
Gerrit-Reviewer: Julius Werner <jwerner@chromium.org>
Gerrit-Reviewer: Kapil Porwal <kapilporwal@google.com>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Lean Sheng Tan <sheng.tan@9elements.com>
Gerrit-Reviewer: Martin L Roth <gaumless@gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Philipp Hug <philipp@hug.cx>
Gerrit-Reviewer: Sean Rhodes <sean@starlabs.systems>
Gerrit-Reviewer: Subrata Banik <subratabanik@google.com>
Gerrit-Reviewer: Tarun <tstuli@gmail.com>
Gerrit-Reviewer: Tim Chu <Tim.Chu@quantatw.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh@siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-Reviewer: ron minnich <rminnich@gmail.com>
Gerrit-CC: 9elements QA <hardwaretestrobot@gmail.com>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Attention: Eran Mitrani <mitrani@google.com>
Gerrit-Attention: Philipp Hug <philipp@hug.cx>
Gerrit-Attention: Jakub Czapiga <czapiga@google.com>
Gerrit-Attention: Jonathan Zhang <jon.zhixiong.zhang@gmail.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro@chromium.org>
Gerrit-Attention: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Attention: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Attention: Sean Rhodes <sean@starlabs.systems>
Gerrit-Attention: Nico Huber <nico.h@gmx.de>
Gerrit-Attention: Subrata Banik <subratabanik@google.com>
Gerrit-Attention: Johnny Lin <Johnny_Lin@wiwynn.com>
Gerrit-Attention: Christian Walter <christian.walter@9elements.com>
Gerrit-Attention: Lean Sheng Tan <sheng.tan@9elements.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred@gmail.com>
Gerrit-Attention: Werner Zeh <werner.zeh@siemens.com>
Gerrit-Attention: ron minnich <rminnich@gmail.com>
Gerrit-Attention: Tim Chu <Tim.Chu@quantatw.com>
Gerrit-Attention: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Attention: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Gerrit-Attention: Julius Werner <jwerner@chromium.org>
Gerrit-Attention: Tarun <tstuli@gmail.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk@gmail.com>
Gerrit-Attention: Martin L Roth <gaumless@gmail.com>
Gerrit-Attention: Kapil Porwal <kapilporwal@google.com>
Gerrit-MessageType: newchange