diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
| commit | e9a1a01f90ab2dae92def1547c81ae778d690cdb (patch) | |
| tree | b588b1a09357599530841bedac2823486b8f12c9 /os/hal/hal.mk | |
| parent | 709c28c9299e4464a0654443f87ce0180403fef8 (diff) | |
| parent | b634bd9beef41b5b141b994efa4ac3d55505d0c4 (diff) | |
| download | ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.gz ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.bz2 ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.zip | |
Merge branch 'master' into rng
Added haltest
Conflicts:
os/hal/hal.mk
os/hal/include/hal_community.h
os/hal/src/hal_community.c
Diffstat (limited to 'os/hal/hal.mk')
| -rw-r--r-- | os/hal/hal.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/os/hal/hal.mk b/os/hal/hal.mk index 8ac84dd..8dc09f7 100644 --- a/os/hal/hal.mk +++ b/os/hal/hal.mk @@ -5,6 +5,17 @@ HALSRC += ${CHIBIOS_CONTRIB}/os/hal/src/hal_community.c \ ${CHIBIOS_CONTRIB}/os/hal/src/onewire.c \
${CHIBIOS_CONTRIB}/os/hal/src/eicu.c \
${CHIBIOS_CONTRIB}/os/hal/src/crc.c \
- ${CHIBIOS_CONTRIB}/os/hal/src/rng.c
+ ${CHIBIOS_CONTRIB}/os/hal/src/rng.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_debug.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_desciter.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_hub.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_msd.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_ftdi.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/usbh/usbh_uvc.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/ee24xx.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/ee25xx.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/eeprom.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/timcap.c \
HALINC += ${CHIBIOS_CONTRIB}/os/hal/include
|