aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2019-01-21 21:11:16 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2019-01-21 21:11:16 +0000
commite351308f44bb293075c1ba40d1757047ee644874 (patch)
tree901c90c8f8fa878ed69f1d7d3df62658cabbe7bc /os
parent9d21d501b5356dd7b85e1e8600846cee5a611ee5 (diff)
downloadChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.gz
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.bz2
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.zip
Mass update of configuration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12575 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os')
-rw-r--r--os/hal/templates/halconf.h2
-rw-r--r--os/nil/include/ch.h2
-rw-r--r--os/nil/templates/chconf.h4
-rw-r--r--os/rt/templates/chconf.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/os/hal/templates/halconf.h b/os/hal/templates/halconf.h
index 917b8e495..138f4986a 100644
--- a/os/hal/templates/halconf.h
+++ b/os/hal/templates/halconf.h
@@ -29,7 +29,7 @@
#define HALCONF_H
#define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
#include "mcuconf.h"
diff --git a/os/nil/include/ch.h b/os/nil/include/ch.h
index 835faa1fd..8d44d13d3 100644
--- a/os/nil/include/ch.h
+++ b/os/nil/include/ch.h
@@ -479,7 +479,7 @@
#error "missing or wrong configuration file"
#endif
-#if !defined(_CHIBIOS_NIL_CONF_VER_3_0_)
+#if !defined(_CHIBIOS_NIL_CONF_VER_3_2_)
#error "obsolete or unknown configuration file"
#endif
diff --git a/os/nil/templates/chconf.h b/os/nil/templates/chconf.h
index 3ffd3ceae..7efabe727 100644
--- a/os/nil/templates/chconf.h
+++ b/os/nil/templates/chconf.h
@@ -15,7 +15,7 @@
*/
/**
- * @file templates/chconf.h
+ * @file nil/templates/chconf.h
* @brief Configuration file template.
* @details A copy of this file must be placed in each project directory, it
* contains the application specific kernel settings.
@@ -29,7 +29,7 @@
#define CHCONF_H
#define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
/*===========================================================================*/
/**
diff --git a/os/rt/templates/chconf.h b/os/rt/templates/chconf.h
index e6fc90137..3d46e3045 100644
--- a/os/rt/templates/chconf.h
+++ b/os/rt/templates/chconf.h
@@ -15,7 +15,7 @@
*/
/**
- * @file templates/chconf.h
+ * @file rt/templates/chconf.h
* @brief Configuration file template.
* @details A copy of this file must be placed in each project directory, it
* contains the application specific kernel settings.