diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 06:49:51 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 06:49:51 -0600 |
| commit | 0b34d78f7f3cf30969bdf12ad24f64aaa2dd28e0 (patch) | |
| tree | 6c121a2ca991c45b2f33b0ae190da802c5b0cce3 /nuttx/arch/arm/src/a1x | |
| parent | 7b8e6ff54398eab1bc9f205ca7e9719228ef4526 (diff) | |
| download | px4-nuttx-0b34d78f7f3cf30969bdf12ad24f64aaa2dd28e0.tar.gz px4-nuttx-0b34d78f7f3cf30969bdf12ad24f64aaa2dd28e0.tar.bz2 px4-nuttx-0b34d78f7f3cf30969bdf12ad24f64aaa2dd28e0.zip | |
Remove CONFIG_DEBUG_STACK. Adding CONFIG_STACK_COLORATION makes this configuration option pointless
Diffstat (limited to 'nuttx/arch/arm/src/a1x')
| -rw-r--r-- | nuttx/arch/arm/src/a1x/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/a1x/a1x_irq.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/a1x/Make.defs b/nuttx/arch/arm/src/a1x/Make.defs index 177b423fd..dc7a61b5a 100644 --- a/nuttx/arch/arm/src/a1x/Make.defs +++ b/nuttx/arch/arm/src/a1x/Make.defs @@ -123,10 +123,6 @@ ifeq ($(CONFIG_STACK_COLORATION),y) CMN_CSRCS += up_checkstack.c endif -ifeq ($(CONFIG_DEBUG_STACK),y) -CMN_CSRCS += up_checkstack.c -endif - # A1x-specific assembly language files CHIP_ASRCS = diff --git a/nuttx/arch/arm/src/a1x/a1x_irq.c b/nuttx/arch/arm/src/a1x/a1x_irq.c index 6dbee9c32..bce61765f 100644 --- a/nuttx/arch/arm/src/a1x/a1x_irq.c +++ b/nuttx/arch/arm/src/a1x/a1x_irq.c @@ -165,7 +165,8 @@ void up_irqinitialize(void) } /* Colorize the interrupt stack for debug purposes */ -#if (defined(CONFIG_DEBUG_STACK) || defined(CONFIG_STACK_COLORATION)) && CONFIG_ARCH_INTERRUPTSTACK > 3 + +#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3 { size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3); up_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size), |