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/ports/NRF51/NRF51822/platform.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/ports/NRF51/NRF51822/platform.mk')
| -rw-r--r-- | os/hal/ports/NRF51/NRF51822/platform.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/hal/ports/NRF51/NRF51822/platform.mk b/os/hal/ports/NRF51/NRF51822/platform.mk index 663ca1f..11259e5 100644 --- a/os/hal/ports/NRF51/NRF51822/platform.mk +++ b/os/hal/ports/NRF51/NRF51822/platform.mk @@ -1,5 +1,5 @@ ifeq ($(USE_SMART_BUILD),yes) -HALCONF := $(strip $(shell cat halconf.h | egrep -e "define")) +HALCONF := $(strip $(shell cat halconf.h halconf_community.h | egrep -e "define")) # List of all the NRF51x platform files. PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \ |