aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-10 10:08:00 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-10 10:08:00 +0000
commitc0de7a327dbb6d17318cbb368b75a7219f517c29 (patch)
treed39d9bad5a6ba9e0fd2798f0323bbb60f4ae6887 /demos
parent2b3150149fbe38632ed7d8e8c2606eee18aea421 (diff)
downloadChibiOS-c0de7a327dbb6d17318cbb368b75a7219f517c29.tar.gz
ChibiOS-c0de7a327dbb6d17318cbb368b75a7219f517c29.tar.bz2
ChibiOS-c0de7a327dbb6d17318cbb368b75a7219f517c29.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6289 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/nil/NIL-STM32F051-DISCOVERY/Makefile12
-rw-r--r--demos/nil/NIL-STM32F303-DISCOVERY/Makefile12
-rw-r--r--demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile12
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/Makefile14
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h2
-rw-r--r--demos/rt/RT-STM32F051-DISCOVERY/Makefile12
-rw-r--r--demos/rt/RT-STM32F303-DISCOVERY/Makefile12
-rw-r--r--demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile12
-rw-r--r--demos/rt/RT-STM32F407-DISCOVERY/Makefile12
9 files changed, 2 insertions, 98 deletions
diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
index 169329564..231dbe213 100644
--- a/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F051-DISCOVERY/Makefile
@@ -58,11 +58,6 @@ 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
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -194,12 +189,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
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 996b12433..bde9dffd6 100644
--- a/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32F303-DISCOVERY/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_FPU),)
USE_FPU = no
endif
-# Enable this if you really want to use the STM FWLib.
-ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -199,12 +194,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk
diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
index 22601a777..80c13cd09 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_FPU),)
USE_FPU = no
endif
-# Enable this if you really want to use the STM FWLib.
-ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -199,12 +194,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
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 7fd5af6cb..48bf96351 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/Makefile
@@ -58,11 +58,6 @@ 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
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -85,7 +80,7 @@ include $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32l1xx.mk
#include $(CHIBIOS)/test/test.mk
# Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F303xC.ld
+LDSCRIPT= $(PORTLD)/STM32L152xB.ld
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -195,12 +190,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
index 440d43beb..7cdcfbf02 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
@@ -51,7 +51,7 @@
* The value one is not valid, timeouts are rounded up to
* this value.
*/
-#define NIL_CFG_TIMEDELTA 2
+#define NIL_CFG_TIMEDELTA 0
/**
* @brief Events Flags APIs.
diff --git a/demos/rt/RT-STM32F051-DISCOVERY/Makefile b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
index 5a9d67e99..6ee0911a7 100644
--- a/demos/rt/RT-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F051-DISCOVERY/Makefile
@@ -58,11 +58,6 @@ 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
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -194,12 +189,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
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 42f67b9e2..9071bc31e 100644
--- a/demos/rt/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F303-DISCOVERY/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_FPU),)
USE_FPU = no
endif
-# Enable this if you really want to use the STM FWLib.
-ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -199,12 +194,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
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 41bd774a4..6d6c54232 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_FPU),)
USE_FPU = no
endif
-# Enable this if you really want to use the STM FWLib.
-ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -199,12 +194,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
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 41bd774a4..6d6c54232 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_FPU),)
USE_FPU = no
endif
-# Enable this if you really want to use the STM FWLib.
-ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
-endif
-
#
# Architecture or project specific options
##############################################################################
@@ -199,12 +194,5 @@ ULIBS =
# End of user defines
##############################################################################
-ifeq ($(USE_FWLIB),yes)
- include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
- CSRC += $(STM32SRC)
- INCDIR += $(STM32INC)
- USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk