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

1 files changed, 34 insertions, 45 deletions

diff --git a/testhal/STM32F1xx/ADC/Makefile b/testhal/STM32F1xx/ADC/Makefile
index 0f7e20317..dc0ec1b0b 100644
--- a/testhal/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32F1xx/ADC/Makefile
@@ -5,7 +5,7 @@
 

 # Compiler options here.

 ifeq ($(USE_OPT),)

-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

+  USE_OPT = -O2 -ggdb -fomit-frame-pointer

 endif

 

 # C specific options here (added to USE_OPT).

@@ -23,6 +23,11 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes

 endif

 

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

 # If enabled, this option allows to compile the application in THUMB mode.

 ifeq ($(USE_THUMB),)

   USE_THUMB = yes

@@ -41,9 +46,21 @@ endif
 # Architecture or project specific options

 #

 

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

-ifeq ($(USE_FWLIB),)

-  USE_FWLIB = 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

+

+# Enables the use of FPU on Cortex-M4.

+ifeq ($(USE_FPU),)

+  USE_FPU = no

 endif

 

 #

@@ -59,15 +76,16 @@ PROJECT = ch
 

 # Imported source files and paths

 CHIBIOS = ../../..

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

-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

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

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

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

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

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

+include $(CHIBIOS)/os/hal/ports/STM32F1xx/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_stm32f1xx.mk

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

 

 # Define linker script file here

-LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+LDSCRIPT = $(PORTLD)/STM32F103xB.ld

 

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

 # setting.

@@ -75,10 +93,9 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

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

-       $(CHIBIOS)/os/various/syscalls.c \

        main.c

 

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

@@ -109,7 +126,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

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

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

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

          $(CHIBIOS)/os/various

 

 #

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

 #

 

-MCU  = cortex-m3

+MCU  = cortex-m4

 

 #TRGT = arm-elf-

 TRGT = arm-none-eabi-

@@ -134,6 +151,7 @@ LD   = $(TRGT)gcc
 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

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

 #

 

@@ -199,11 +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

-

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

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

+include $(RULESPATH)/rules.mk