aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/Doxyfile2
-rw-r--r--os/kernel/include/ch.h4
-rw-r--r--readme.txt2
3 files changed, 5 insertions, 3 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile
index 161188400..9effb593d 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.1.0
+PROJECT_NUMBER = 2.1.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 31131ecff..bce040584 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -39,7 +39,7 @@
/**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.1.0unstable"
+#define CH_KERNEL_VERSION "2.1.1unstable"
/**
* @brief Kernel version major number.
@@ -54,7 +54,7 @@
/**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 0
+#define CH_KERNEL_PATCH 1
/*
* Common values.
diff --git a/readme.txt b/readme.txt
index 9e87eba3a..d72a4f0a2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -59,6 +59,8 @@
*****************************************************************************
*** 2.1.1 ***
+- FIX: Fixed H_LOCK and H_UNLOCK redefined with CH_USE_MALLOC_HEAP (bug
+ 3025549)(backported to 2.0.2).
- FIX: Added option to enforce the stack alignment to 32 or 64 bits in the
Cortex-Mx port (bug 3025133)(backported to 2.0.2).