From 82c9694c5bbce002bb3044ea5897ab2bb79027c4 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 23 Mar 2014 10:07:52 -0600 Subject: [PATCH] All ARM Make.defs files should build up_checkstack.c if DEBUG_STACK is enabled --- arch/arm/src/c5471/Make.defs | 6 +++++- arch/arm/src/calypso/Make.defs | 6 +++++- arch/arm/src/dm320/Make.defs | 6 +++++- arch/arm/src/imx/Make.defs | 6 +++++- arch/arm/src/lpc214x/Make.defs | 6 +++++- arch/arm/src/lpc2378/Make.defs | 8 ++++++-- arch/arm/src/lpc31xx/Make.defs | 6 +++++- arch/arm/src/sam34/Make.defs | 6 +++++- arch/arm/src/str71x/Make.defs | 6 +++++- arch/arm/src/tiva/Make.defs | 4 ++++ 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/arch/arm/src/c5471/Make.defs b/arch/arm/src/c5471/Make.defs index 016cc36d7b..79157d8f88 100644 --- a/arch/arm/src/c5471/Make.defs +++ b/arch/arm/src/c5471/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # c5471/Make.defs # -# Copyright (C) 2007, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -48,6 +48,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = c5471_lowputc.S c5471_vectors.S CHIP_CSRCS = c5471_irq.c c5471_serial.c c5471_timerisr.c c5471_watchdog.c \ c5471_ethernet.c diff --git a/arch/arm/src/calypso/Make.defs b/arch/arm/src/calypso/Make.defs index 957604f365..ef0e466a13 100644 --- a/arch/arm/src/calypso/Make.defs +++ b/arch/arm/src/calypso/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # calypso/Make.defs # -# Copyright (C) 2007, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Copyright (C) 2011 Stefan Richter. All rights reserved. @@ -52,6 +52,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = calypso_lowputc.S CHIP_CSRCS = calypso_irq.c calypso_timer.c calypso_heap.c calypso_serial.c \ calypso_spi.c clock.c calypso_uwire.c calypso_armio.c calypso_keypad.c diff --git a/arch/arm/src/dm320/Make.defs b/arch/arm/src/dm320/Make.defs index fc51170de6..bc6b69ab0d 100644 --- a/arch/arm/src/dm320/Make.defs +++ b/arch/arm/src/dm320/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # dm320/Make.defs # -# Copyright (C) 2007, 2010, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2010, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -49,6 +49,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = dm320_lowputc.S dm320_restart.S CHIP_CSRCS = dm320_allocateheap.c dm320_boot.c dm320_decodeirq.c \ dm320_irq.c dm320_serial.c dm320_timerisr.c dm320_framebuffer.c diff --git a/arch/arm/src/imx/Make.defs b/arch/arm/src/imx/Make.defs index ef88e28cd5..8135f99e5d 100644 --- a/arch/arm/src/imx/Make.defs +++ b/arch/arm/src/imx/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/imx/Make.defs # -# Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -49,6 +49,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = imx_lowputc.S CHIP_CSRCS = imx_boot.c imx_gpio.c imx_allocateheap.c imx_irq.c \ imx_serial.c imx_timerisr.c imx_decodeirq.c imx_spi.c diff --git a/arch/arm/src/lpc214x/Make.defs b/arch/arm/src/lpc214x/Make.defs index 28c826eecb..a7789a3afe 100644 --- a/arch/arm/src/lpc214x/Make.defs +++ b/arch/arm/src/lpc214x/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # lpc214x/Make.defs # -# Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -52,6 +52,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = lpc214x_lowputc.S CHIP_CSRCS = lpc214x_decodeirq.c lpc214x_irq.c lpc214x_timerisr.c \ lpc214x_serial.c diff --git a/arch/arm/src/lpc2378/Make.defs b/arch/arm/src/lpc2378/Make.defs index 5c4d282ee0..e7a2b52cdc 100644 --- a/arch/arm/src/lpc2378/Make.defs +++ b/arch/arm/src/lpc2378/Make.defs @@ -1,12 +1,12 @@ ############################################################################## # lpc23xx/Make.defs # -# Copyright (C) 2010, 2013 Rommel Marcelo. All rights reserved. +# Copyright (C) 2010 Rommel Marcelo. All rights reserved. # Author: Rommel Marcelo # # This file is part of the NuttX RTOS and based on the lpc2148 port: # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -57,6 +57,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = lpc23xx_lowputc.S CHIP_CSRCS = lpc23xx_pllsetup.c lpc23xx_decodeirq.c lpc23xx_irq.c lpc23xx_timerisr.c \ lpc23xx_serial.c lpc23xx_io.c diff --git a/arch/arm/src/lpc31xx/Make.defs b/arch/arm/src/lpc31xx/Make.defs index 005bb784de..bcc7671047 100644 --- a/arch/arm/src/lpc31xx/Make.defs +++ b/arch/arm/src/lpc31xx/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/lpc31xx/Make.defs # -# Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2011, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -55,6 +55,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CGU_ASRCS = CGU_CSRCS = lpc31_bcrndx.c lpc31_clkdomain.c lpc31_clkexten.c diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index df6e30c423..b559f70559 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/sam34/Make.defs # -# Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2011, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -74,6 +74,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + # Required SAM3/4 files CHIP_ASRCS = diff --git a/arch/arm/src/str71x/Make.defs b/arch/arm/src/str71x/Make.defs index b7a7e1bbc6..5da6fd5b70 100644 --- a/arch/arm/src/str71x/Make.defs +++ b/arch/arm/src/str71x/Make.defs @@ -1,7 +1,7 @@ ############################################################################## # arch/arm/src/str71x/Make.defs # -# Copyright (C) 2008, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -52,6 +52,10 @@ ifeq ($(CONFIG_ELF),y) CMN_CSRCS += up_elf.c endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + CHIP_ASRCS = CHIP_CSRCS = str71x_prccu.c str71x_lowputc.c str71x_decodeirq.c str71x_irq.c \ str71x_timerisr.c str71x_serial.c diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index 5e218fd8a2..9fb7a4eb60 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -54,6 +54,10 @@ ifeq ($(CONFIG_ARCH_MEMCPY),y) CMN_ASRCS += up_memcpy.S endif +ifeq ($(CONFIG_DEBUG_STACK),y) +CMN_CSRCS += up_checkstack.c +endif + ifeq ($(CONFIG_NUTTX_KERNEL),y) CMN_CSRCS += up_mpu.c up_task_start.c up_pthread_start.c up_stackframe.c ifneq ($(CONFIG_DISABLE_SIGNALS),y)