8 files changed, 19 insertions, 15 deletions
diff --git a/bsps/arm/stm32f4/include/bsp.h b/bsps/arm/stm32f4/include/bsp.h
index 30ab881ece..c37684f5aa 100644
--- a/bsps/arm/stm32f4/include/bsp.h
+++ b/bsps/arm/stm32f4/include/bsp.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * @ingroup arm_stm34f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief Global BSP definitions.
  */
 
@@ -18,16 +18,19 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
+#ifndef LIBBSP_ARM_STM32F4_BSP_H
+#define LIBBSP_ARM_STM32F4_BSP_H
+
 /**
- * @defgroup arm_stm32f4 STM32F4 Support
+ * @defgroup RTEMSBSPsARMSTM32F4 STM32F4
+ *
  * @ingroup RTEMSBSPsARM
- * @brief STM32f4 Support Package
+ *
+ * @brief STM32F4 Board Support Package.
+ *
  * @{
  */
 
-#ifndef LIBBSP_ARM_STM32F4_BSP_H
-#define LIBBSP_ARM_STM32F4_BSP_H
-
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
@@ -45,10 +48,11 @@ extern "C" {
 
 #define BSP_ARMV7M_SYSTICK_FREQUENCY STM32F4_HCLK
 
-/** @} */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
+/** @} */
+
+
 #endif /* LIBBSP_ARM_STM32F4_BSP_H */
diff --git a/bsps/arm/stm32f4/include/bsp/i2c.h b/bsps/arm/stm32f4/include/bsp/i2c.h
index fa18b1f92f..9effe63ae1 100644
--- a/bsps/arm/stm32f4/include/bsp/i2c.h
+++ b/bsps/arm/stm32f4/include/bsp/i2c.h
@@ -37,7 +37,7 @@ extern "C" {
 
 /**
  * @defgroup stm32f4_i2c I2C Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief I2C Module
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/io.h b/bsps/arm/stm32f4/include/bsp/io.h
index b7f8669cba..412fa8fbfc 100644
--- a/bsps/arm/stm32f4/include/bsp/io.h
+++ b/bsps/arm/stm32f4/include/bsp/io.h
@@ -31,7 +31,7 @@ extern "C" {
 
 /**
  * @defgroup stm32f4_io IO Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief IO Support
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/irq.h b/bsps/arm/stm32f4/include/bsp/irq.h
index 4771f521fe..1035a43519 100644
--- a/bsps/arm/stm32f4/include/bsp/irq.h
+++ b/bsps/arm/stm32f4/include/bsp/irq.h
@@ -39,7 +39,7 @@ extern "C" {
 
 /**
  * @defgroup stm32f4_interrupt Interrupt Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief Interrupt Support
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/rcc.h b/bsps/arm/stm32f4/include/bsp/rcc.h
index f1bd7d173c..599cba9342 100644
--- a/bsps/arm/stm32f4/include/bsp/rcc.h
+++ b/bsps/arm/stm32f4/include/bsp/rcc.h
@@ -30,7 +30,7 @@ extern "C" {
 
 /**
  * @defgroup stm32f4_rcc RCC Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief RCC Support
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
index ecb4bb900c..d5324171a9 100644
--- a/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
@@ -25,7 +25,7 @@
 
 /**
  * @defgroup stm32f4_exti EXTI Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief STM32F10XXX EXTI Support
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/stm32f4.h b/bsps/arm/stm32f4/include/bsp/stm32f4.h
index 154d4f6d7b..9901e7ccfc 100644
--- a/bsps/arm/stm32f4/include/bsp/stm32f4.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4.h
@@ -30,7 +30,7 @@
 
 /**
  * @defgroup stm32f4_reg Register Defintions
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief Register Definitions
  * @{
  */
diff --git a/bsps/arm/stm32f4/include/bsp/usart.h b/bsps/arm/stm32f4/include/bsp/usart.h
index bac0f6845a..3d5646a066 100644
--- a/bsps/arm/stm32f4/include/bsp/usart.h
+++ b/bsps/arm/stm32f4/include/bsp/usart.h
@@ -25,7 +25,7 @@
 
 /**
  * @defgroup stm32f4_usart USART Support
- * @ingroup arm_stm32f4
+ * @ingroup RTEMSBSPsARMSTM32F4
  * @brief USART Support
  * @{
  */