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

8 files changed, 97 insertions, 228 deletions

diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
index c90b5cf28..990cfb19b 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
@@ -41,6 +41,18 @@ 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 = 0x100

+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

+

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

 ifeq ($(USE_FWLIB),)

   USE_FWLIB = no

@@ -154,29 +166,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

 #

 

@@ -206,4 +195,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
index 041b276bf..421a2adfd 100644
--- a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
@@ -127,7 +127,6 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

 #

diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
index 9400ff789..7162b099f 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/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 = 0x100

+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

@@ -116,7 +127,6 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

 #

@@ -161,29 +171,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

 #

 

@@ -206,15 +193,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

-  DADEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-  DADEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

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

   CSRC += $(STM32SRC)

@@ -222,4 +200,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
index 95f856c83..c5eb8e5db 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
@@ -41,10 +41,16 @@ endif
 # Architecture or project specific options

 #

 

-# 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

+# 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 = 0x100

+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

 

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

@@ -127,7 +133,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 # Compiler settings

 #

 

-MCU  = cortex-m4

+MCU  = cortex-m3

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-

@@ -161,29 +167,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

 #

 

@@ -206,15 +189,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

-  DADEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-  DADEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

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

   CSRC += $(STM32SRC)

@@ -222,4 +196,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
index a8cd936e4..ea1ece763 100644
--- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
@@ -41,6 +41,18 @@ 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 = 0x200

+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

+

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

 ifeq ($(USE_FWLIB),)

   USE_FWLIB = no

@@ -154,29 +166,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

 #

 

@@ -206,4 +195,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/rt/RT-STM32F303-DISCOVERY/Makefile b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
index 4aa6ae0a2..002cad778 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F303-DISCOVERY/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

@@ -116,7 +127,6 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

 #

@@ -161,29 +171,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

 #

 

@@ -206,15 +193,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

-  DADEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-  DADEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

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

   CSRC += $(STM32SRC)

@@ -222,4 +200,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
index 149eee346..8258d6699 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/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

@@ -75,7 +86,6 @@ 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.

@@ -117,7 +127,6 @@ ASMSRC = $(PORTASM)
 

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

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

-         $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

 #

@@ -162,29 +171,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

 #

 

@@ -207,15 +193,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

-  DADEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-  DADEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

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

   CSRC += $(STM32SRC)

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

 endif

 

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

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

+include $(RULESPATH)/rules.mk

diff --git a/demos/rt/RT-STM32F407-DISCOVERY/Makefile b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
index fbbfe020f..8258d6699 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY/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

@@ -75,7 +86,6 @@ 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.

@@ -161,29 +171,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

 #

 

@@ -206,15 +193,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

-  DADEFS += -DCORTEX_USE_FPU=TRUE

-else

-  DDEFS += -DCORTEX_USE_FPU=FALSE

-  DADEFS += -DCORTEX_USE_FPU=FALSE

-endif

-

 ifeq ($(USE_FWLIB),yes)

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

   CSRC += $(STM32SRC)

@@ -222,4 +200,5 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

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

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

+include $(RULESPATH)/rules.mk