git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6283 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 22 insertions, 39 deletions

diff --git a/testhal/STM32F4xx/RTC/Makefile b/testhal/STM32F4xx/RTC/Makefile
index b9d5cc989..9d44e68a3 100644
--- a/testhal/STM32F4xx/RTC/Makefile
+++ b/testhal/STM32F4xx/RTC/Makefile
@@ -41,8 +41,19 @@ endif
 # Architecture or project specific options

 #

 

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

 # Enables the use of FPU on Cortex-M4.

-# Enable this if you really want to use the STM FWLib.

 ifeq ($(USE_FPU),)

   USE_FPU = no

 endif

@@ -65,16 +76,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

-include $(CHIBIOS)/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk

-include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk

-include $(CHIBIOS)/os/kernel/kernel.mk

-include $(CHIBIOS)/test/test.mk

+include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS1/board.mk

+include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk

+#include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

 LDSCRIPT= $(PORTLD)/STM32F407xG.ld

-#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -82,6 +93,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        $(CHIBIOS)/os/various/evtimer.c \

@@ -119,7 +131,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various

 

 #

@@ -164,29 +176,6 @@ CPPWARN = -Wall -Wextra
 ##############################################################################

 

 ##############################################################################

-# Start of default section

-#

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################

-

-##############################################################################

 # Start of user section

 #

 

@@ -209,13 +198,6 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-ifeq ($(USE_FPU),yes)

-  USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant

-  DDEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

   include $(CHIBIOS)/ext/stm32lib/stm32lib.mk

   CSRC += $(STM32SRC)

@@ -223,4 +205,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk

+RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk