[coreboot-gerrit] New patch to review for coreboot: 1c3193b Kconfig: Fix incorrect CONFIG_STACK_SIZE values for X86 and ARM64

Aaron Durbin (adurbin@chromium.org) gerrit at coreboot.org
Wed Apr 15 00:17:57 CEST 2015


Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9696

-gerrit

commit 1c3193b958a590f8e822a3406421e352a4986664
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Dec 18 19:24:48 2014 -0800

    Kconfig: Fix incorrect CONFIG_STACK_SIZE values for X86 and ARM64
    
    Commit 54229a7 (arm: Fix checkstack() to use correct stack size) didn't
    quite hit the mark. Due to the crazy way our Kconfig includes work, It
    accidentally set CONFIG_STACK_SIZE to 0 even on architectures that need
    it.
    
    This patch fixes the issue by moving everything back to a single entry
    in src/Kconfig, making sure we end up with the intended numbers on all
    architectures.
    
    BRANCH=None
    BUG=chrome-os-partner:34750
    TEST=Built for Pinky, Urara, Falco and Ryu. Confirmed that the generated
    .config contained CONFIG_STACK_SIZE=0x0 for the former two, and
    CONFIG_STACK_SIZE=0x1000 for the latter.
    
    Original-Change-Id: Ib18561925aafe7c74e6c4f0b10b55000a785e144
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/236753
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    
    (cherry picked from commit c64b127e163f98162f3f7195b6ed09bd5a4b77c4)
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    
    Change-Id: I2c747b04760bc97f43523596640bfb15317e5730
---
 src/Kconfig           | 1 +
 src/arch/arm/Kconfig  | 5 -----
 src/arch/mips/Kconfig | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 8a5d905..6cf3134 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -319,6 +319,7 @@ config HEAP_SIZE
 
 config STACK_SIZE
 	hex
+	default 0x0 if (ARCH_RAMSTAGE_ARM || ARCH_RAMSTAGE_MIPS)
 	default 0x1000
 
 config MAX_CPUS
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 6bef91c..2499d2d 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -31,8 +31,3 @@ config ARM_BOOTBLOCK_CUSTOM
 config ARM_LPAE
 	bool
 	default n
-
-# Mark SMP stack size as 0 since we keep using SRAM stack throughout ramstage.
-config STACK_SIZE
-	hex
-	default 0x0
diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig
index 71e5dc8..10349f2 100644
--- a/src/arch/mips/Kconfig
+++ b/src/arch/mips/Kconfig
@@ -39,8 +39,3 @@ config ARCH_ROMSTAGE_MIPS
 config ARCH_RAMSTAGE_MIPS
 	bool
 	default n
-
-# Mark SMP stack size as 0 since we keep using SRAM stack throughout ramstage.
-config STACK_SIZE
-	hex
-	default 0x0



More information about the coreboot-gerrit mailing list