diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-12-18 19:24:48 -0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-04-15 00:22:13 +0200 |
| commit | 89be154f0fffb3fcf06ce3ff9bb5f8c1edd0e02b (patch) | |
| tree | 1e3f2ab53b40e6864775b91d146335ab87efe73d | |
| parent | 90f6cd35673b10535227db0b2b5fa8379804933f (diff) | |
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@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/236753
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
(cherry picked from commit c64b127e163f98162f3f7195b6ed09bd5a4b77c4)
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: I2c747b04760bc97f43523596640bfb15317e5730
Reviewed-on: http://review.coreboot.org/9696
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/Kconfig | 1 | ||||
| -rw-r--r-- | src/arch/arm/Kconfig | 5 | ||||
| -rw-r--r-- | src/arch/mips/Kconfig | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/Kconfig b/src/Kconfig index 8a5d905a07..6cf31343cc 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 6bef91ce77..2499d2d075 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 71e5dc84eb..10349f2d1b 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 |