diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-11-03 10:03:52 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-11-03 10:03:52 -0600 |
| commit | 96513af3646b373cbbfc8b73875cb151261f7cb1 (patch) | |
| tree | 077f50a684955a047398880a814d4ec6bbb9fce3 | |
| parent | 6df37a835b9c033ac9ed3a40015dd32456f87cd2 (diff) | |
| download | nuttx-96513af3646b373cbbfc8b73875cb151261f7cb1.tar.gz nuttx-96513af3646b373cbbfc8b73875cb151261f7cb1.tar.bz2 nuttx-96513af3646b373cbbfc8b73875cb151261f7cb1.zip | |
SAMA5 CAN: Add board-specific initialization logic
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/src/Makefile | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1cbbd8a9d..f75ce8c82 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5954,3 +5954,6 @@ completion after and address with data write and on any data write so that the device is complete before WRDI is sent. From David Sidrane (2013-11-2). + * configs/sama5/src/sam_can.c: Add CAN initialization logic + (2013-11-3). + diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index c62673ea3..de72046fd 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/configs/sama5d3x-ek/README.txt @@ -705,7 +705,7 @@ CAN Usage Only messages that have IDs that match the CONFIG_SAMA5_CANn_ADDRn when both the received and the configured address are masked by CONFIG_SAMA5_CANn_MASKn - will be accepted. For eacmple, if the mask is all ones, then only messasges + will be accepted. For example, if the mask is all ones, then only messasges with exact address matches will be accepted; if the mask is all zeroes than any address will be accepted. diff --git a/nuttx/configs/sama5d3x-ek/src/Makefile b/nuttx/configs/sama5d3x-ek/src/Makefile index 53d37be29..6d492cb1e 100644 --- a/nuttx/configs/sama5d3x-ek/src/Makefile +++ b/nuttx/configs/sama5d3x-ek/src/Makefile @@ -110,6 +110,10 @@ ifeq ($(CONFIG_ADC),y) CSRCS += sam_adc.c endif +ifeq ($(CONFIG_CAN),y) +CSRCS += sam_can.c +endif + ifeq ($(CONFIG_USBMSC),y) CSRCS += sam_usbmsc.c endif |