diff options
25 files changed, 96 insertions, 6 deletions
diff --git a/demos/ARM7-AT91SAM7S-GCC/chconf.h b/demos/ARM7-AT91SAM7S-GCC/chconf.h index 0f86d95fa..8cada3cd9 100644 --- a/demos/ARM7-AT91SAM7S-GCC/chconf.h +++ b/demos/ARM7-AT91SAM7S-GCC/chconf.h @@ -459,6 +459,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARM7-AT91SAM7X-GCC/chconf.h b/demos/ARM7-AT91SAM7X-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARM7-AT91SAM7X-GCC/chconf.h +++ b/demos/ARM7-AT91SAM7X-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/chconf.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/chconf.h index 367215352..6ddb1d2d1 100644 --- a/demos/ARM7-AT91SAM7X-LWIP-GCC/chconf.h +++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/chconf.h @@ -481,6 +481,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/chconf.h b/demos/ARM7-AT91SAM7X-UIP-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/chconf.h +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARM7-LPC214x-FATFS-GCC/chconf.h b/demos/ARM7-LPC214x-FATFS-GCC/chconf.h index 046d28300..c49dc7571 100644 --- a/demos/ARM7-LPC214x-FATFS-GCC/chconf.h +++ b/demos/ARM7-LPC214x-FATFS-GCC/chconf.h @@ -480,4 +480,8 @@ struct { \ #endif /* _CHCONF_H_ */
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
/** @} */
diff --git a/demos/ARM7-LPC214x-G++/chconf.h b/demos/ARM7-LPC214x-G++/chconf.h index 046d28300..c49dc7571 100644 --- a/demos/ARM7-LPC214x-G++/chconf.h +++ b/demos/ARM7-LPC214x-G++/chconf.h @@ -480,4 +480,8 @@ struct { \ #endif /* _CHCONF_H_ */
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
/** @} */
diff --git a/demos/ARM7-LPC214x-GCC/chconf.h b/demos/ARM7-LPC214x-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARM7-LPC214x-GCC/chconf.h +++ b/demos/ARM7-LPC214x-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARMCM0-LPC1114-GCC/chconf.h b/demos/ARMCM0-LPC1114-GCC/chconf.h index 046d28300..c49dc7571 100644 --- a/demos/ARMCM0-LPC1114-GCC/chconf.h +++ b/demos/ARMCM0-LPC1114-GCC/chconf.h @@ -480,4 +480,8 @@ struct { \ #endif /* _CHCONF_H_ */
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
/** @} */
diff --git a/demos/ARMCM3-LPC1343-GCC/chconf.h b/demos/ARMCM3-LPC1343-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARMCM3-LPC1343-GCC/chconf.h +++ b/demos/ARMCM3-LPC1343-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/chconf.h b/demos/ARMCM3-STM32F103-FATFS-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARMCM3-STM32F103-FATFS-GCC/chconf.h +++ b/demos/ARMCM3-STM32F103-FATFS-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARMCM3-STM32F103-GCC/chconf.h b/demos/ARMCM3-STM32F103-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARMCM3-STM32F103-GCC/chconf.h +++ b/demos/ARMCM3-STM32F103-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/ARMCM3-STM32F107-GCC/chconf.h b/demos/ARMCM3-STM32F107-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/ARMCM3-STM32F107-GCC/chconf.h +++ b/demos/ARMCM3-STM32F107-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/AVR-AT90CANx-GCC/chconf.h b/demos/AVR-AT90CANx-GCC/chconf.h index 2cda27e83..33dcfdfca 100644 --- a/demos/AVR-AT90CANx-GCC/chconf.h +++ b/demos/AVR-AT90CANx-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/AVR-ATmega128-GCC/chconf.h b/demos/AVR-ATmega128-GCC/chconf.h index 2cda27e83..33dcfdfca 100644 --- a/demos/AVR-ATmega128-GCC/chconf.h +++ b/demos/AVR-ATmega128-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/MSP430-MSP430x1611-GCC/chconf.h b/demos/MSP430-MSP430x1611-GCC/chconf.h index 2a40e33e2..f92563155 100644 --- a/demos/MSP430-MSP430x1611-GCC/chconf.h +++ b/demos/MSP430-MSP430x1611-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/PPC-SPC563-GCC/chconf.h b/demos/PPC-SPC563-GCC/chconf.h index 046d28300..6522e0b3b 100644 --- a/demos/PPC-SPC563-GCC/chconf.h +++ b/demos/PPC-SPC563-GCC/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/Posix-GCC/chconf.h b/demos/Posix-GCC/chconf.h index dd249746f..c1aa2b710 100644 --- a/demos/Posix-GCC/chconf.h +++ b/demos/Posix-GCC/chconf.h @@ -482,4 +482,8 @@ struct { \ #endif /* _CHCONF_H_ */
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
/** @} */
diff --git a/demos/STM8S-STM8S208-RC/chconf.h b/demos/STM8S-STM8S208-RC/chconf.h index 5643c94e7..a426256ef 100644 --- a/demos/STM8S-STM8S208-RC/chconf.h +++ b/demos/STM8S-STM8S208-RC/chconf.h @@ -476,6 +476,10 @@ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/demos/Win32-MinGW/chconf.h b/demos/Win32-MinGW/chconf.h index dd249746f..59a895f70 100644 --- a/demos/Win32-MinGW/chconf.h +++ b/demos/Win32-MinGW/chconf.h @@ -480,6 +480,10 @@ struct { \ #define chThdGetExitEventSource(tp) (&(tp)->p_exitesource)
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/os/kernel/templates/chconf.h b/os/kernel/templates/chconf.h index 046d28300..6522e0b3b 100644 --- a/os/kernel/templates/chconf.h +++ b/os/kernel/templates/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h index 224d09c68..7ccc59290 100644 --- a/os/ports/GCC/ARMCMx/chcore.h +++ b/os/ports/GCC/ARMCMx/chcore.h @@ -140,10 +140,10 @@ * @brief PENDSV handler priority.
* @note The default PENDSV handler priority is set at the
* @p CORTEX_MINIMUM_PRIORITY priority level.
- * @note In the ARMv7-M port this value should be not changed from the
- * minimum priority level.
- * @note The PENDSV vector is only used in the ARMv7-M port, it is available
- * to user in the ARMv6-M port.
+ * @note The PENDSV vector is only used in the ARMv7-M legacy port, it is
+ * available to user in the ARMv6-M and ARMv7-M ports.
+ * @note In the ARMv7-M legacy port this value should be not changed from
+ * the minimum priority level.
*/
#ifndef CORTEX_PRIORITY_PENDSV
#define CORTEX_PRIORITY_PENDSV CORTEX_MINIMUM_PRIORITY
diff --git a/os/ports/GCC/ARMCMx/port.dox b/os/ports/GCC/ARMCMx/port.dox index b59624fab..39840fe44 100644 --- a/os/ports/GCC/ARMCMx/port.dox +++ b/os/ports/GCC/ARMCMx/port.dox @@ -109,8 +109,8 @@ * @defgroup ARMCMx_CONF Configuration Options
* @brief ARM Cortex-Mx Configuration Options.
* @details The ARMCMx port allows some architecture-specific configurations
- * settings that can be overridden externally. Usually there is no need to
- * change the default values.
+ * settings that can be overridden by redefining them in @p chconf.h.
+* Usually there is no need to change the default values.
* - @p INT_REQUIRED_STACK, this value represent the amount of stack space used
* by an interrupt handler between the @p extctx and @p intctx
* structures.<br>
diff --git a/readme.txt b/readme.txt index ac08f1a35..f49689c30 100644 --- a/readme.txt +++ b/readme.txt @@ -66,6 +66,8 @@ faster, also saved few bytes of RAM.
- Added explicit casts in chevents.h, chqueues.h, chqueues.c in order to
silence some warnings on a specific compiler.
+- Added a section in chconf.h where redefine the port-related configuration
+ parameters, also added a note to the configuration about this.
*** 1.5.8 ***
- FIX: Fixed missing files from ST library zip file (bug 3006629).
diff --git a/test/coverage/chconf.h b/test/coverage/chconf.h index 65ac31b4f..9458d0257 100644 --- a/test/coverage/chconf.h +++ b/test/coverage/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
diff --git a/testhal/STM32/chconf.h b/testhal/STM32/chconf.h index 046d28300..6522e0b3b 100644 --- a/testhal/STM32/chconf.h +++ b/testhal/STM32/chconf.h @@ -478,6 +478,10 @@ struct { \ }
#endif
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h). */
+/*===========================================================================*/
+
#endif /* _CHCONF_H_ */
/** @} */
|