5 files changed, 21 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
index a0726a735d..15dc1109b3 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
@@ -56,7 +56,7 @@ struct rtems_bsdnet_ifconfig;
 /**
  * @defgroup lpc24xx LPC24XX Support
  *
- * @ingroup bsp_kit
+ * @ingroup bsp_arm
  *
  * @brief LPC24XX support package.
  *
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h b/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
index fa8c016674..8836264de9 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
+++ b/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup raspberrypi
+ * @ingroup arm_raspberrypi
  *
  * @brief Global BSP definitions.
  */
diff --git a/c/src/lib/libbsp/arm/shared/doxygen.h b/c/src/lib/libbsp/arm/shared/doxygen.h
new file mode 100644
index 0000000000..83035100d8
--- /dev/null
+++ b/c/src/lib/libbsp/arm/shared/doxygen.h
@@ -0,0 +1,15 @@
+  /**
+  *  @defgroup bsp_arm ARM
+  *
+  *  @ingroup bsp_kit
+  *
+  *  @brief ARM Board Support Packages
+  */
+
+ /**
+  *  @defgroup arm_shared ARM Shared Modules
+  *
+  *  @ingroup bsp_arm
+  *
+  *  @brief ARM Shared Modules
+  */
diff --git a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h b/c/src/lib/libbsp/arm/shared/include/linker-symbols.h
index 57af053201..0d69411039 100644
--- a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h
+++ b/c/src/lib/libbsp/arm/shared/include/linker-symbols.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup bsp_linker
+ * @ingroup arm_linker
  *
  * @brief Symbols defined in linker command base file.
  */
@@ -28,9 +28,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup bsp_linker Linker Support
+ * @defgroup arm_linker Linker Support
  *
- * @ingroup bsp_kit
+ * @ingroup arm_shared
  *
  * @brief Linker support.
  *
diff --git a/c/src/lib/libbsp/arm/shared/include/start.h b/c/src/lib/libbsp/arm/shared/include/start.h
index 99fa774663..933027181d 100644
--- a/c/src/lib/libbsp/arm/shared/include/start.h
+++ b/c/src/lib/libbsp/arm/shared/include/start.h
@@ -34,7 +34,7 @@ extern "C" {
 /**
  * @defgroup arm_start System Start
  *
- * @ingroup bsp_arm
+ * @ingroup arm_shared
  *
  * @brief ARM system low level start.
  *
@@ -140,11 +140,3 @@ BSP_START_TEXT_SECTION static inline void bsp_start_clear_bss(void)
 #endif /* __cplusplus */
 
 #endif /* LIBBSP_ARM_SHARED_START_H */
-
-/**
- * @defgroup bsp_arm ARM
- *
- * @ingroup bsp_kit
- *
- * @brief ARM Board Support Packages.
- */