diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-10 15:03:00 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-10 15:03:00 +0000 |
| commit | 8d6ed07363e4a6f6cb48ab337441352c71adae11 (patch) | |
| tree | f28704d58bdd718c4c68bcafcb77d55d9a85c1fb | |
| parent | 51b16c7a2dbd4f3d0be30049a4dad702961bfb8b (diff) | |
| download | ChibiOS-8d6ed07363e4a6f6cb48ab337441352c71adae11.tar.gz ChibiOS-8d6ed07363e4a6f6cb48ab337441352c71adae11.tar.bz2 ChibiOS-8d6ed07363e4a6f6cb48ab337441352c71adae11.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6127 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM4-STM32F303-DISCOVERY/.project | 5 | ||||
| -rw-r--r-- | demos/ARMCM4-STM32F303-DISCOVERY/Makefile | 2 | ||||
| -rw-r--r-- | os/hal/boards/ST_STM32F3_DISCOVERY/board.c | 1 | ||||
| -rw-r--r-- | os/hal/boards/ST_STM32F3_DISCOVERY/board.mk | 4 |
4 files changed, 3 insertions, 9 deletions
diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/.project b/demos/ARMCM4-STM32F303-DISCOVERY/.project index 5e8664b65..34b2fab1a 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/.project +++ b/demos/ARMCM4-STM32F303-DISCOVERY/.project @@ -25,11 +25,6 @@ </natures>
<linkedResources>
<link>
- <name>board</name>
- <type>2</type>
- <locationURI>CHIBIOS/boards/ST_STM32F3_DISCOVERY</locationURI>
- </link>
- <link>
<name>os</name>
<type>2</type>
<locationURI>CHIBIOS/os</locationURI>
diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile index 087991465..42aa01893 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile +++ b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile @@ -65,9 +65,9 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../..
-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
diff --git a/os/hal/boards/ST_STM32F3_DISCOVERY/board.c b/os/hal/boards/ST_STM32F3_DISCOVERY/board.c index baafd6550..ef05d62a7 100644 --- a/os/hal/boards/ST_STM32F3_DISCOVERY/board.c +++ b/os/hal/boards/ST_STM32F3_DISCOVERY/board.c @@ -14,7 +14,6 @@ limitations under the License.
*/
-#include "ch.h"
#include "hal.h"
#if HAL_USE_PAL || defined(__DOXYGEN__)
diff --git a/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk b/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk index 522082fe9..766531cee 100644 --- a/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk +++ b/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk @@ -1,5 +1,5 @@ # List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/ST_STM32F3_DISCOVERY/board.c
+BOARDSRC = ${CHIBIOS}/os/hal/boards/ST_STM32F3_DISCOVERY/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/ST_STM32F3_DISCOVERY
+BOARDINC = ${CHIBIOS}/os/hal/boards/ST_STM32F3_DISCOVERY
|