diff options
| author | Diego Ismirlian <dismirlian (at) google's mail.com> | 2018-08-20 21:16:55 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian (at) google's mail.com> | 2018-08-20 21:16:55 -0300 |
| commit | dd1799beda52bbcbea7f4b091280b1d8b80c8b77 (patch) | |
| tree | 0c78b6b6c57cba8c90a6eff79959ce74f5b902d4 /testhal | |
| parent | 0936be2541015b384b00e31ece7f42a510511aaa (diff) | |
| parent | 9692d1b7ae9f5f9d9c1520381fb3edcee131c3ee (diff) | |
| download | ChibiOS-Contrib-dd1799beda52bbcbea7f4b091280b1d8b80c8b77.tar.gz ChibiOS-Contrib-dd1799beda52bbcbea7f4b091280b1d8b80c8b77.tar.bz2 ChibiOS-Contrib-dd1799beda52bbcbea7f4b091280b1d8b80c8b77.zip | |
Merge branch 'master' of https://github.com/MegabytePhreak/ChibiOS-Contrib
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/STM32/STM32F4xx/USB_HOST/Makefile | 27 | ||||
| -rw-r--r-- | testhal/STM32/STM32F4xx/USB_HOST/chconf.h | 2 |
2 files changed, 12 insertions, 17 deletions
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile index a29150e..7bd8ea1 100644 --- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile +++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile @@ -30,7 +30,7 @@ endif # Enable this if you want link time optimizations (LTO)
ifeq ($(USE_LTO),)
- USE_LTO = yes
+ USE_LTO = no
endif
# If enabled, this option allows to compile the application in THUMB mode.
@@ -88,6 +88,9 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
# Startup files.
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional).
@@ -98,6 +101,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
@@ -111,17 +116,9 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = $(STARTUPSRC) \
- $(KERNSRC) \
- $(PORTSRC) \
- $(OSALSRC) \
- $(HALSRC) \
- $(PLATFORMSRC) \
- $(BOARDSRC) \
- $(TESTSRC) \
+CSRC = $(ALLCSRC) \
+ $(TESTSRC) \
$(FATFSSRC) \
- $(STREAMSSRC) \
- $(SHELLSRC) \
main.c usbh_custom_class_example.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -152,10 +149,7 @@ TCPPSRC = ASMSRC =
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(CHIBIOS)/os/license \
- $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
- $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(STREAMSINC) $(SHELLINC) $(FATFSINC) \
+INCDIR = $(ALLINC) $(TESTINC) $(FATFSINC) \
$(CHIBIOS_CONTRIB)/os/various
#
@@ -224,5 +218,6 @@ ULIBS = # End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+include $(RULESPATH)/arm-none-eabi.mk
include $(RULESPATH)/rules.mk
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h index 53bd676..d94d8c3 100644 --- a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h +++ b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h @@ -29,7 +29,7 @@ #define CHCONF_H
#define _CHIBIOS_RT_CONF_
-#define _CHIBIOS_RT_CONF_VER_5_0_
+#define _CHIBIOS_RT_CONF_VER_6_0_
/*===========================================================================*/
/**
|