aboutsummaryrefslogtreecommitdiffstats
path: root/demos/TIVA/RT-TM4C1294-LAUNCHPAD
diff options
context:
space:
mode:
authormarcoveeneman <marco-veeneman@hotmail.com>2016-05-02 15:53:26 +0200
committermarcoveeneman <marco-veeneman@hotmail.com>2016-05-02 15:53:26 +0200
commitfe1d3f21146b1d28bd281b3682a528042b80253c (patch)
tree8fd76b61b15073d9ab1e776c753546e859f1c868 /demos/TIVA/RT-TM4C1294-LAUNCHPAD
parente6137bb7e44a3b75a51b70e82513c54d09cde595 (diff)
parent99230d289cc3f1a42c3027240bcf71002d67cd72 (diff)
downloadChibiOS-Contrib-fe1d3f21146b1d28bd281b3682a528042b80253c.tar.gz
ChibiOS-Contrib-fe1d3f21146b1d28bd281b3682a528042b80253c.tar.bz2
ChibiOS-Contrib-fe1d3f21146b1d28bd281b3682a528042b80253c.zip
Merge pull request #55 from marcoveeneman/tiva-wdg-driver
Tiva WDG driver
Diffstat (limited to 'demos/TIVA/RT-TM4C1294-LAUNCHPAD')
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile6
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h16
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h16
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c2
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h16
5 files changed, 53 insertions, 3 deletions
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
index 344d3e8..63815df 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
@@ -135,9 +135,11 @@ TCSRC =
TCPPSRC =
# List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC =
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+INCDIR = $(CHIBIOS)/os/license \
+ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
index e99b5b3..15db44a 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
@@ -1,3 +1,19 @@
+/*
+ ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
#ifndef _CHCONF_H_
#define _CHCONF_H_
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h
index 60c4b8a..cd6edf3 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/halconf.h
@@ -1,3 +1,19 @@
+/*
+ ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
#ifndef _HALCONF_H_
#define _HALCONF_H_
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
index adb915e..5184e3e 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2014 Marco Veeneman
+ Copyright (C) 2014..2016 Marco Veeneman
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h
index 00b4fe5..3abab92 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h
@@ -1,4 +1,20 @@
/*
+ Copyright (C) 2014..2016 Marco Veeneman
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/*
* TM4C129x drivers configuration.
* The following settings override the default settings present in
* the various device driver implementation headers.