From da174a1aa8ef9b4b7668c71c5e57c376ab8c1c70 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 31 Aug 2013 08:29:25 +0000 Subject: [PATCH] Fixed bug #430. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@6233 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- docs/Doxyfile_chm | 2 +- docs/Doxyfile_html | 2 +- os/kernel/include/ch.h | 4 ++-- os/ports/GCC/ARMCMx/LPC11xx/ld/LPC1114.ld | 1 + os/ports/GCC/ARMCMx/LPC13xx/ld/LPC1343.ld | 1 + os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F100xB.ld | 1 + os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xB.ld | 1 + os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xE.ld | 1 + os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xG.ld | 1 + os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F107xC.ld | 1 + os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F205xB.ld | 1 + os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F207xG.ld | 1 + os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F405xG.ld | 1 + os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG.ld | 1 + os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG_CCM.ld | 1 + os/ports/GCC/ARMCMx/STM32L1xx/ld/STM32L152xB.ld | 1 + readme.txt | 3 +++ 17 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm index b4847e864..d12242bf9 100644 --- a/docs/Doxyfile_chm +++ b/docs/Doxyfile_chm @@ -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.4.5 +PROJECT_NUMBER = 2.4.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html index ce53b4385..7d3343f06 100644 --- a/docs/Doxyfile_html +++ b/docs/Doxyfile_html @@ -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.4.5 +PROJECT_NUMBER = 2.4.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 653ad0fdd..c32024cfe 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -47,7 +47,7 @@ /** * @brief Kernel version string. */ -#define CH_KERNEL_VERSION "2.4.5" +#define CH_KERNEL_VERSION "2.4.6" /** * @name Kernel version @@ -66,7 +66,7 @@ /** * @brief Kernel version patch number. */ -#define CH_KERNEL_PATCH 5 +#define CH_KERNEL_PATCH 6 /** @} */ /* diff --git a/os/ports/GCC/ARMCMx/LPC11xx/ld/LPC1114.ld b/os/ports/GCC/ARMCMx/LPC11xx/ld/LPC1114.ld index 380299b3a..f9d961363 100644 --- a/os/ports/GCC/ARMCMx/LPC11xx/ld/LPC1114.ld +++ b/os/ports/GCC/ARMCMx/LPC11xx/ld/LPC1114.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/LPC13xx/ld/LPC1343.ld b/os/ports/GCC/ARMCMx/LPC13xx/ld/LPC1343.ld index 8ef7e3790..9c0029140 100644 --- a/os/ports/GCC/ARMCMx/LPC13xx/ld/LPC1343.ld +++ b/os/ports/GCC/ARMCMx/LPC13xx/ld/LPC1343.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F100xB.ld b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F100xB.ld index e3248fc9d..7e52211ae 100644 --- a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F100xB.ld +++ b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F100xB.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xB.ld b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xB.ld index 1ff4ea95c..515ecd71c 100644 --- a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xB.ld +++ b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xB.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xE.ld b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xE.ld index a69953f24..61a31232b 100644 --- a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xE.ld +++ b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xE.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xG.ld b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xG.ld index fd9ca7361..16fd3c750 100644 --- a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xG.ld +++ b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F103xG.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F107xC.ld b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F107xC.ld index e70774b57..f78486df8 100644 --- a/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F107xC.ld +++ b/os/ports/GCC/ARMCMx/STM32F1xx/ld/STM32F107xC.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F205xB.ld b/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F205xB.ld index d8e14e5bd..af49e7a44 100644 --- a/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F205xB.ld +++ b/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F205xB.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F207xG.ld b/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F207xG.ld index 38618f672..4fe290186 100644 --- a/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F207xG.ld +++ b/os/ports/GCC/ARMCMx/STM32F2xx/ld/STM32F207xG.ld @@ -106,6 +106,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F405xG.ld b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F405xG.ld index f094d7b2f..9002c9f17 100644 --- a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F405xG.ld +++ b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F405xG.ld @@ -107,6 +107,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG.ld b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG.ld index fdf5ff753..35602c19c 100644 --- a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG.ld +++ b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG.ld @@ -107,6 +107,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG_CCM.ld b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG_CCM.ld index 47b8f65a8..a9026caa3 100644 --- a/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG_CCM.ld +++ b/os/ports/GCC/ARMCMx/STM32F4xx/ld/STM32F407xG_CCM.ld @@ -107,6 +107,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/os/ports/GCC/ARMCMx/STM32L1xx/ld/STM32L152xB.ld b/os/ports/GCC/ARMCMx/STM32L1xx/ld/STM32L152xB.ld index 407f78fce..4a803bddf 100644 --- a/os/ports/GCC/ARMCMx/STM32L1xx/ld/STM32L152xB.ld +++ b/os/ports/GCC/ARMCMx/STM32L1xx/ld/STM32L152xB.ld @@ -105,6 +105,7 @@ SECTIONS . = ALIGN(8); } > flash + . = ALIGN(4); _etext = .; _textdata = _etext; diff --git a/readme.txt b/readme.txt index cca2162f2..bce97846f 100644 --- a/readme.txt +++ b/readme.txt @@ -78,6 +78,9 @@ *** Releases *** ***************************************************************************** +*** 2.4.6 *** +- FIX: Fixed possible unalignment in GCC Cortex-M scatter files (bug #430). + *** 2.4.5 *** - FIX: Fixed PAL driver errors (bug #429). - FIX: Fixed USB HAL driver compile error (bug #428).