<div dir="ltr">What's the rationale for changing the group names and is this described in the software engineering guide?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Feb 27, 2019 at 3:05 AM Sebastian Huber <<a href="mailto:sebastian.huber@embedded-brains.de">sebastian.huber@embedded-brains.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Update #3706.<br>
---<br>
 bsps/arm/beagle/include/bsp.h          |  2 +-<br>
 bsps/arm/csb336/include/bsp.h          |  2 +-<br>
 bsps/arm/csb337/include/bsp.h          |  2 +-<br>
 bsps/arm/csb337/umon/doxygen.h         |  4 +---<br>
 bsps/arm/edb7312/include/bsp.h         |  2 +-<br>
 bsps/arm/gdbarmsim/include/bsp.h       |  2 +-<br>
 bsps/arm/gumstix/include/bsp.h         |  2 +-<br>
 bsps/arm/lm3s69xx/include/bsp.h        |  2 +-<br>
 bsps/arm/lpc176x/include/bsp.h         |  2 +-<br>
 bsps/arm/lpc24xx/include/bsp.h         |  2 +-<br>
 bsps/arm/lpc32xx/include/bsp.h         |  2 +-<br>
 bsps/arm/raspberrypi/include/bsp.h     |  2 +-<br>
 bsps/arm/realview-pbx-a9/include/bsp.h |  2 +-<br>
 bsps/arm/rtl22xx/include/bsp.h         |  2 +-<br>
 bsps/arm/shared/doxygen.h              | 16 ++++++++--------<br>
 bsps/arm/stm32f4/include/bsp.h         |  2 +-<br>
 bsps/arm/xilinx-zynq/include/bsp.h     |  2 +-<br>
 bsps/bfin/TLL6527M/include/bsp.h       |  2 +-<br>
 bsps/bfin/eZKit533/include/bsp.h       |  2 +-<br>
 bsps/bfin/shared/doxygen.h             | 18 +++++++-----------<br>
 bsps/epiphany/shared/doxygen.h         |  7 +++++++<br>
 bsps/i386/pc386/include/bsp.h          |  4 ++--<br>
 bsps/i386/shared/doxygen.h             |  8 +++++---<br>
 bsps/include/bsp/bootcard.h            |  8 +++-----<br>
 bsps/include/bsp/irq-generic.h         |  2 +-<br>
 bsps/include/bsp/stackalloc.h          |  2 +-<br>
 bsps/lm32/lm32_evr/include/bsp.h       |  2 +-<br>
 bsps/lm32/milkymist/include/bsp.h      |  2 +-<br>
 bsps/lm32/shared/doxygen.h             | 16 ++++++++--------<br>
 bsps/m68k/av5282/include/bsp.h         |  2 +-<br>
 bsps/m68k/csb360/include/bsp.h         |  2 +-<br>
 bsps/m68k/gen68340/include/bsp.h       |  2 +-<br>
 bsps/m68k/gen68360/doxygen.h           | 15 ---------------<br>
 bsps/m68k/genmcf548x/include/bsp.h     |  2 +-<br>
 bsps/m68k/mcf52235/include/bsp.h       |  2 +-<br>
 bsps/m68k/shared/doxygen.h             | 16 ++++++++--------<br>
 bsps/mips/shared/doxygen.h             | 14 ++++++++------<br>
 bsps/moxie/shared/doxygen.h            |  7 +++++++<br>
 bsps/nios2/shared/doxygen.h            |  7 +++++++<br>
 bsps/no_cpu/shared/doxygen.h           |  7 +++++++<br>
 bsps/or1k/shared/doxygen.h             |  7 +++++++<br>
 bsps/powerpc/include/bsp/vmeUniverse.h |  2 --<br>
 bsps/powerpc/mvme3100/doxygen.h        | 15 ---------------<br>
 bsps/powerpc/shared/doxygen.h          | 14 +++++++-------<br>
 bsps/powerpc/shared/vme/doxygen.h      |  4 +---<br>
 bsps/riscv/shared/doxygen.h            |  7 +++++++<br>
 bsps/sh/shared/doxygen.h               |  7 +++++++<br>
 bsps/shared/dev/clock/clockimpl.h      |  2 +-<br>
 bsps/shared/doxygen.h                  | 15 +++++++--------<br>
 bsps/shared/start/bootcard.c           | 15 +--------------<br>
 bsps/shared/start/stackalloc.c         |  2 +-<br>
 bsps/sparc/erc32/include/bsp.h         |  2 +-<br>
 bsps/sparc/leon2/include/bsp.h         |  2 +-<br>
 bsps/sparc/leon3/include/bsp.h         |  2 +-<br>
 bsps/sparc/shared/doxygen.h            | 16 ++++++++--------<br>
 bsps/sparc64/shared/doxygen.h          |  7 +++++++<br>
 bsps/v850/shared/doxygen.h             |  7 +++++++<br>
 bsps/x86_64/shared/doxygen.h           |  7 +++++++<br>
 58 files changed, 175 insertions(+), 157 deletions(-)<br>
 create mode 100644 bsps/epiphany/shared/doxygen.h<br>
 delete mode 100644 bsps/m68k/gen68360/doxygen.h<br>
 create mode 100644 bsps/moxie/shared/doxygen.h<br>
 create mode 100644 bsps/nios2/shared/doxygen.h<br>
 create mode 100644 bsps/no_cpu/shared/doxygen.h<br>
 create mode 100644 bsps/or1k/shared/doxygen.h<br>
 delete mode 100644 bsps/powerpc/mvme3100/doxygen.h<br>
 create mode 100644 bsps/riscv/shared/doxygen.h<br>
 create mode 100644 bsps/sh/shared/doxygen.h<br>
 create mode 100644 bsps/sparc64/shared/doxygen.h<br>
 create mode 100644 bsps/v850/shared/doxygen.h<br>
 create mode 100644 bsps/x86_64/shared/doxygen.h<br>
<br>
diff --git a/bsps/arm/beagle/include/bsp.h b/bsps/arm/beagle/include/bsp.h<br>
index 7767456a8e..f15d9102ad 100644<br>
--- a/bsps/arm/beagle/include/bsp.h<br>
+++ b/bsps/arm/beagle/include/bsp.h<br>
@@ -350,7 +350,7 @@ static inline void write_ttbr0(uint32_t bar)<br>
 /**<br>
  * @defgroup arm_beagle Beaglebone, Beagleboard Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief Beaglebones and beagleboards support package<br>
  *<br>
diff --git a/bsps/arm/csb336/include/bsp.h b/bsps/arm/csb336/include/bsp.h<br>
index ed036d5454..c886dd9a5f 100644<br>
--- a/bsps/arm/csb336/include/bsp.h<br>
+++ b/bsps/arm/csb336/include/bsp.h<br>
@@ -32,7 +32,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup arm_csb336 CSB336 Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief CSB336 support package.<br>
  *<br>
diff --git a/bsps/arm/csb337/include/bsp.h b/bsps/arm/csb337/include/bsp.h<br>
index c99de2fd0a..c757bf1bc9 100644<br>
--- a/bsps/arm/csb337/include/bsp.h<br>
+++ b/bsps/arm/csb337/include/bsp.h<br>
@@ -31,7 +31,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup arm_csb337 CSB337 Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief CSB337 support package.<br>
  *<br>
diff --git a/bsps/arm/csb337/umon/doxygen.h b/bsps/arm/csb337/umon/doxygen.h<br>
index a74d3c3e8b..dbf48d6602 100644<br>
--- a/bsps/arm/csb337/umon/doxygen.h<br>
+++ b/bsps/arm/csb337/umon/doxygen.h<br>
@@ -1,7 +1,5 @@<br>
 /**<br>
  *  @defgroup shared_umon SHARED UMON Modules<br>
  *<br>
- *  @ingroup bsp_shared<br>
- *<br>
  *  @brief SHARED UMON Modules<br>
- */<br>
\ No newline at end of file<br>
+ */<br>
diff --git a/bsps/arm/edb7312/include/bsp.h b/bsps/arm/edb7312/include/bsp.h<br>
index fa7a480970..0317ed7cc2 100644<br>
--- a/bsps/arm/edb7312/include/bsp.h<br>
+++ b/bsps/arm/edb7312/include/bsp.h<br>
@@ -31,7 +31,7 @@ extern "C" {<br>
<br>
 /**<br>
  * @defgroup arm_edb7312 EDB7312 Support<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  * @brief EDB7312 Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/arm/gdbarmsim/include/bsp.h b/bsps/arm/gdbarmsim/include/bsp.h<br>
index 0010d5845c..66e5636912 100644<br>
--- a/bsps/arm/gdbarmsim/include/bsp.h<br>
+++ b/bsps/arm/gdbarmsim/include/bsp.h<br>
@@ -32,7 +32,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup arm_gdbarmsim GDBARMSIM Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief GDBARMSIM support package.<br>
  *<br>
diff --git a/bsps/arm/gumstix/include/bsp.h b/bsps/arm/gumstix/include/bsp.h<br>
index 33cc6e4cea..687ffde4e1 100644<br>
--- a/bsps/arm/gumstix/include/bsp.h<br>
+++ b/bsps/arm/gumstix/include/bsp.h<br>
@@ -26,7 +26,7 @@ extern "C" {<br>
<br>
 /**<br>
  * @defgroup arm_gumstix Gumstix Support<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  * @brief Gumstix support package<br>
  * @{<br>
  */<br>
diff --git a/bsps/arm/lm3s69xx/include/bsp.h b/bsps/arm/lm3s69xx/include/bsp.h<br>
index b07656cb73..1fae730892 100644<br>
--- a/bsps/arm/lm3s69xx/include/bsp.h<br>
+++ b/bsps/arm/lm3s69xx/include/bsp.h<br>
@@ -46,7 +46,7 @@<br>
 /**<br>
  * @defgroup arm_lm3s69xx LM3S69XX Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief LM3S69XX Support Package<br>
  */<br>
diff --git a/bsps/arm/lpc176x/include/bsp.h b/bsps/arm/lpc176x/include/bsp.h<br>
index 14c55f4194..8c34de5164 100644<br>
--- a/bsps/arm/lpc176x/include/bsp.h<br>
+++ b/bsps/arm/lpc176x/include/bsp.h<br>
@@ -47,7 +47,7 @@ struct rtems_bsdnet_ifconfig;<br>
 /**<br>
  * @defgroup lpc176x LPC176X Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief LPC176X support package.<br>
  *<br>
diff --git a/bsps/arm/lpc24xx/include/bsp.h b/bsps/arm/lpc24xx/include/bsp.h<br>
index 5424808841..ac59a2a887 100644<br>
--- a/bsps/arm/lpc24xx/include/bsp.h<br>
+++ b/bsps/arm/lpc24xx/include/bsp.h<br>
@@ -56,7 +56,7 @@ struct rtems_termios_device_context;<br>
 /**<br>
  * @defgroup lpc24xx LPC24XX Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief LPC24XX support package.<br>
  *<br>
diff --git a/bsps/arm/lpc32xx/include/bsp.h b/bsps/arm/lpc32xx/include/bsp.h<br>
index 8ccb637a01..a91f92bd35 100644<br>
--- a/bsps/arm/lpc32xx/include/bsp.h<br>
+++ b/bsps/arm/lpc32xx/include/bsp.h<br>
@@ -43,7 +43,7 @@ struct rtems_bsdnet_ifconfig;<br>
 /**<br>
  * @defgroup arm_lpc32xx LPC32XX Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief LPC32XX support package.<br>
  *<br>
diff --git a/bsps/arm/raspberrypi/include/bsp.h b/bsps/arm/raspberrypi/include/bsp.h<br>
index ecd5b6af08..4e8c6c945e 100644<br>
--- a/bsps/arm/raspberrypi/include/bsp.h<br>
+++ b/bsps/arm/raspberrypi/include/bsp.h<br>
@@ -62,7 +62,7 @@ void rpi_start_rtems_on_secondary_processor(void);<br>
 /**<br>
  * @defgroup arm_raspberrypi Raspberry Pi Support<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief Raspberry Pi support package<br>
  *<br>
diff --git a/bsps/arm/realview-pbx-a9/include/bsp.h b/bsps/arm/realview-pbx-a9/include/bsp.h<br>
index 4423984e47..7e0bac3e18 100644<br>
--- a/bsps/arm/realview-pbx-a9/include/bsp.h<br>
+++ b/bsps/arm/realview-pbx-a9/include/bsp.h<br>
@@ -60,7 +60,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup arm_realview-pbx-a9 Realview PBX-A9<br>
  *<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  *<br>
  * @brief Realview PBX-A9 support package<br>
  *<br>
diff --git a/bsps/arm/rtl22xx/include/bsp.h b/bsps/arm/rtl22xx/include/bsp.h<br>
index 9b376daf0d..64861591e6 100644<br>
--- a/bsps/arm/rtl22xx/include/bsp.h<br>
+++ b/bsps/arm/rtl22xx/include/bsp.h<br>
@@ -21,7 +21,7 @@<br>
<br>
 /**<br>
  * @defgroup arm_rtl22xx RTL22XX Support<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  * @brief RTL22XX Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/arm/shared/doxygen.h b/bsps/arm/shared/doxygen.h<br>
index 83035100d8..5c685c71c9 100644<br>
--- a/bsps/arm/shared/doxygen.h<br>
+++ b/bsps/arm/shared/doxygen.h<br>
@@ -1,15 +1,15 @@<br>
-  /**<br>
-  *  @defgroup bsp_arm ARM<br>
-  *<br>
-  *  @ingroup bsp_kit<br>
-  *<br>
-  *  @brief ARM Board Support Packages<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsARM ARM<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief ARM Board Support Packages.<br>
+ */<br>
<br>
  /**<br>
   *  @defgroup arm_shared ARM Shared Modules<br>
   *<br>
-  *  @ingroup bsp_arm<br>
+  *  @ingroup RTEMSBSPsARM<br>
   *<br>
   *  @brief ARM Shared Modules<br>
   */<br>
diff --git a/bsps/arm/stm32f4/include/bsp.h b/bsps/arm/stm32f4/include/bsp.h<br>
index 50052bc810..30ab881ece 100644<br>
--- a/bsps/arm/stm32f4/include/bsp.h<br>
+++ b/bsps/arm/stm32f4/include/bsp.h<br>
@@ -20,7 +20,7 @@<br>
<br>
 /**<br>
  * @defgroup arm_stm32f4 STM32F4 Support<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  * @brief STM32f4 Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h<br>
index afc6a66a06..72b98193d2 100644<br>
--- a/bsps/arm/xilinx-zynq/include/bsp.h<br>
+++ b/bsps/arm/xilinx-zynq/include/bsp.h<br>
@@ -38,7 +38,7 @@ extern "C" {<br>
<br>
 /**<br>
  * @defgroup arm_zynq Xilinx-Zynq Support<br>
- * @ingroup bsp_arm<br>
+ * @ingroup RTEMSBSPsARM<br>
  * @brief Xilinz-Zynq Board Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/bfin/TLL6527M/include/bsp.h b/bsps/bfin/TLL6527M/include/bsp.h<br>
index d027d8feff..04ffb1c293 100644<br>
--- a/bsps/bfin/TLL6527M/include/bsp.h<br>
+++ b/bsps/bfin/TLL6527M/include/bsp.h<br>
@@ -33,7 +33,7 @@ extern "C" {<br>
<br>
 /**<br>
  * @defgroup bfin_tll6527m TLL6527M Support<br>
- * @ingroup bsp_bfin<br>
+ * @ingroup RTEMSBSPsBfin<br>
  * @brief TLL6527M Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/bfin/eZKit533/include/bsp.h b/bsps/bfin/eZKit533/include/bsp.h<br>
index 865ed72259..476769e216 100644<br>
--- a/bsps/bfin/eZKit533/include/bsp.h<br>
+++ b/bsps/bfin/eZKit533/include/bsp.h<br>
@@ -38,7 +38,7 @@ extern "C" {<br>
<br>
 /**<br>
  * @defgroup bfin_ezkit533 eZKit533 Support<br>
- * @ingroup bsp_bfin<br>
+ * @ingroup RTEMSBSPsBfin<br>
  * @brief eZKit533 Board Support Package<br>
  * @{<br>
  */<br>
diff --git a/bsps/bfin/shared/doxygen.h b/bsps/bfin/shared/doxygen.h<br>
index 752b513868..0a33c97a93 100644<br>
--- a/bsps/bfin/shared/doxygen.h<br>
+++ b/bsps/bfin/shared/doxygen.h<br>
@@ -1,11 +1,7 @@<br>
- /**<br>
-  *  @defgroup bsp_bfin Blackfin<br>
-  *  @ingroup bsp_kit<br>
-  *  @brief Blackfin Board Support Packages<br>
-  */<br>
-<br>
- /**<br>
-  *  @defgroup bfin_shared Blackfin Shared Modules<br>
-  *  @ingroup bsp_bfin<br>
-  *  @brief Blackfin Shared Modules<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsBfin Blackfin<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Blackfin Board Support Packages.<br>
+ */<br>
diff --git a/bsps/epiphany/shared/doxygen.h b/bsps/epiphany/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..2b7e54e053<br>
--- /dev/null<br>
+++ b/bsps/epiphany/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsEpiphany Epiphany<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Epiphany Board Support Packages.<br>
+ */<br>
diff --git a/bsps/i386/pc386/include/bsp.h b/bsps/i386/pc386/include/bsp.h<br>
index 4ff89527b2..3049ee5a8a 100644<br>
--- a/bsps/i386/pc386/include/bsp.h<br>
+++ b/bsps/i386/pc386/include/bsp.h<br>
@@ -62,9 +62,9 @@ extern "C" {<br>
 #endif<br>
<br>
 /**<br>
- * @degroup pc386_i386 PC386 Support<br>
+ * @degroup i386_pc386 PC386 Support<br>
  *<br>
- * @ingroup bsp_i386<br>
+ * @ingroup RTEMSBSPsI386<br>
  *<br>
  * @brief PC386 support.<br>
  */<br>
diff --git a/bsps/i386/shared/doxygen.h b/bsps/i386/shared/doxygen.h<br>
index b1dd49546e..8b1e7c0287 100644<br>
--- a/bsps/i386/shared/doxygen.h<br>
+++ b/bsps/i386/shared/doxygen.h<br>
@@ -1,7 +1,9 @@<br>
 /**<br>
- *  @defgroup bsp_i386 i386<br>
- *  @ingroup bsp_kit<br>
- *  @brief i386 Board Support Packages<br>
+ * @defgroup RTEMSBSPsI386 i386<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief i386 Board Support Packages.<br>
  */<br>
<br>
 /**<br>
diff --git a/bsps/include/bsp/bootcard.h b/bsps/include/bsp/bootcard.h<br>
index f78000587a..02feaa47e8 100644<br>
--- a/bsps/include/bsp/bootcard.h<br>
+++ b/bsps/include/bsp/bootcard.h<br>
@@ -1,9 +1,7 @@<br>
 /**<br>
  * @file<br>
  *<br>
- * @ingroup bsp_bootcard<br>
- *<br>
- * @brief Standard system startup.<br>
+ * @ingroup RTEMSBSPsSharedStartup<br>
  */<br>
<br>
 /*<br>
@@ -37,9 +35,9 @@ extern "C" {<br>
 #endif /* __cplusplus */<br>
<br>
 /**<br>
- * @defgroup shared_bootcard Bootcard<br>
+ * @defgroup RTEMSBSPsSharedStartup Bootcard<br>
  *<br>
- * @ingroup bsp_shared<br>
+ * @ingroup RTEMSBSPsShared<br>
  *<br>
  * @brief Standard system startup.<br>
  *<br>
diff --git a/bsps/include/bsp/irq-generic.h b/bsps/include/bsp/irq-generic.h<br>
index 187aea84d1..31835d07ba 100644<br>
--- a/bsps/include/bsp/irq-generic.h<br>
+++ b/bsps/include/bsp/irq-generic.h<br>
@@ -110,7 +110,7 @@ static inline rtems_vector_number bsp_interrupt_handler_index(<br>
 /**<br>
  * @defgroup bsp_interrupt BSP Interrupt Support<br>
  *<br>
- * @ingroup bsp_shared<br>
+ * @ingroup RTEMSBSPsShared<br>
  *<br>
  * @brief Generic BSP Interrupt Support<br>
  *<br>
diff --git a/bsps/include/bsp/stackalloc.h b/bsps/include/bsp/stackalloc.h<br>
index 89414c8e6e..71697592b2 100644<br>
--- a/bsps/include/bsp/stackalloc.h<br>
+++ b/bsps/include/bsp/stackalloc.h<br>
@@ -33,7 +33,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup bsp_stack Task Stack Allocator<br>
  *<br>
- * @ingroup bsp_shared<br>
+ * @ingroup RTEMSBSPsShared<br>
  *<br>
  * @brief Task stack initialization, allocation and free functions.<br>
  *<br>
diff --git a/bsps/lm32/lm32_evr/include/bsp.h b/bsps/lm32/lm32_evr/include/bsp.h<br>
index 4f6c9eebfe..7ffc5251a2 100644<br>
--- a/bsps/lm32/lm32_evr/include/bsp.h<br>
+++ b/bsps/lm32/lm32_evr/include/bsp.h<br>
@@ -30,7 +30,7 @@<br>
 /**<br>
  * @defgroup lm32_evr EVR Support<br>
  *<br>
- * @ingroup bsp_lm32<br>
+ * @ingroup RTEMSBSPsLM32<br>
  *<br>
  * @brief EVR support package.<br>
  */<br>
diff --git a/bsps/lm32/milkymist/include/bsp.h b/bsps/lm32/milkymist/include/bsp.h<br>
index d8af4a3124..254da0d32b 100644<br>
--- a/bsps/lm32/milkymist/include/bsp.h<br>
+++ b/bsps/lm32/milkymist/include/bsp.h<br>
@@ -29,7 +29,7 @@<br>
 /**<br>
  * @defgroup lm32_milkymist Milkymist Support<br>
  * <br>
- * @ingroup bsp_lm32<br>
+ * @ingroup RTEMSBSPsLM32<br>
  * <br>
  * @brief Milkymist support package.<br>
  */<br>
diff --git a/bsps/lm32/shared/doxygen.h b/bsps/lm32/shared/doxygen.h<br>
index 134bd1f86a..ace1205502 100644<br>
--- a/bsps/lm32/shared/doxygen.h<br>
+++ b/bsps/lm32/shared/doxygen.h<br>
@@ -1,15 +1,15 @@<br>
-  /**<br>
-  *  @defgroup bsp_lm32 Lattice Mico32<br>
-  *<br>
-  *  @ingroup bsp_kit<br>
-  *<br>
-  *  @brief Lattice Mico32 Board Support Packages<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsLM32 LatticeMicro32 (lm32)<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief LatticeMicro32 Board Support Packages.<br>
+ */<br>
<br>
  /**<br>
   *  @defgroup lm32_shared Lattice Mico32 Shared Modules<br>
   *<br>
-  *  @ingroup bsp_lm32<br>
+  *  @ingroup RTEMSBSPsLM32<br>
   *<br>
   *  @brief Lattice Mico32 Shared Modules<br>
   */<br>
diff --git a/bsps/m68k/av5282/include/bsp.h b/bsps/m68k/av5282/include/bsp.h<br>
index a8b32e745e..643a0c9184 100644<br>
--- a/bsps/m68k/av5282/include/bsp.h<br>
+++ b/bsps/m68k/av5282/include/bsp.h<br>
@@ -13,7 +13,7 @@<br>
 /**<br>
  * @defgroup m68k_av5282 AV5282 Support<br>
  *<br>
- * @ingroup bsp_m68k<br>
+ * @ingroup RTEMSBSPsM68k<br>
  *<br>
  * @brief AV5282 support.<br>
  */<br>
diff --git a/bsps/m68k/csb360/include/bsp.h b/bsps/m68k/csb360/include/bsp.h<br>
index 5272e17ae2..eceb790a08 100644<br>
--- a/bsps/m68k/csb360/include/bsp.h<br>
+++ b/bsps/m68k/csb360/include/bsp.h<br>
@@ -31,7 +31,7 @@<br>
 /**<br>
  * @defgroup m68k_csb360 CSB360 Support<br>
  *<br>
- * @ingroup bsp_m68k<br>
+ * @ingroup RTEMSBSPsM68k<br>
  *<br>
  * @brief CSB360 support.<br>
  */<br>
diff --git a/bsps/m68k/gen68340/include/bsp.h b/bsps/m68k/gen68340/include/bsp.h<br>
index 28d86ff2f7..ca9c79e4b2 100644<br>
--- a/bsps/m68k/gen68340/include/bsp.h<br>
+++ b/bsps/m68k/gen68340/include/bsp.h<br>
@@ -40,7 +40,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup m68k_gen68340 Motorola MC68340 Support<br>
  *<br>
- * @ingroup bsp_m68k<br>
+ * @ingroup RTEMSBSPsM68k<br>
  *<br>
  * @brief Motorola MC68340 support.<br>
  */<br>
diff --git a/bsps/m68k/gen68360/doxygen.h b/bsps/m68k/gen68360/doxygen.h<br>
deleted file mode 100644<br>
index 2a692d28f0..0000000000<br>
--- a/bsps/m68k/gen68360/doxygen.h<br>
+++ /dev/null<br>
@@ -1,15 +0,0 @@<br>
-/**<br>
- *  @defgroup bsp_m68k M68K<br>
- *<br>
- *  @ingroup bsp_kit<br>
- *<br>
- *  @brief M68K Board Support Packages<br>
- */<br>
-<br>
-/**<br>
- *  @defgroup m68k_gen68360 M68K GEN68360 Modules<br>
- *<br>
- *  @ingroup bsp_m68k<br>
- *<br>
- *  @brief M68K GEN68360 Modules<br>
- */<br>
\ No newline at end of file<br>
diff --git a/bsps/m68k/genmcf548x/include/bsp.h b/bsps/m68k/genmcf548x/include/bsp.h<br>
index 77a7bca0e8..82d9287635 100644<br>
--- a/bsps/m68k/genmcf548x/include/bsp.h<br>
+++ b/bsps/m68k/genmcf548x/include/bsp.h<br>
@@ -60,7 +60,7 @@<br>
 /**<br>
  * @defgroup m68k_genmcf548x MCF548X Support<br>
  *<br>
- * @ingroup bsp_m68k<br>
+ * @ingroup RTEMSBSPsM68k<br>
  *<br>
  * @brief MCT548X support.<br>
  */<br>
diff --git a/bsps/m68k/mcf52235/include/bsp.h b/bsps/m68k/mcf52235/include/bsp.h<br>
index ef3b928a24..df30017eab 100644<br>
--- a/bsps/m68k/mcf52235/include/bsp.h<br>
+++ b/bsps/m68k/mcf52235/include/bsp.h<br>
@@ -81,7 +81,7 @@ void Init52235(void);<br>
 /**<br>
  * @defgroup m68k_mcf52235 MCF52235 Support<br>
  *<br>
- * @ingroup bsp_m68k<br>
+ * @ingroup RTEMSBSPsM68k<br>
  *<br>
  * @brief MCF52235 Support Package<br>
  */<br>
diff --git a/bsps/m68k/shared/doxygen.h b/bsps/m68k/shared/doxygen.h<br>
index 0877c51e77..6cf60f2252 100644<br>
--- a/bsps/m68k/shared/doxygen.h<br>
+++ b/bsps/m68k/shared/doxygen.h<br>
@@ -1,15 +1,15 @@<br>
 /**<br>
-  *  @defgroup bsp_m68k M68K<br>
-  *<br>
-  *  @ingroup bsp_kit<br>
-  *<br>
-  *  @brief M68K Board Support Packages<br>
-  */<br>
+ * @defgroup RTEMSBSPsM68k Motorola 68000 and NXP ColdFire (m68k)<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Motorola 68000 and NXP ColdFire Board Support Packagess.<br>
+ */<br>
<br>
 /**<br>
   *  @defgroup m68k_shared M68K Shared Modules<br>
   *<br>
-  *  @ingroup bsp_m68k<br>
+  *  @ingroup RTEMSBSPsM68k<br>
   *<br>
   *  @brief M68K Shared Modules<br>
-  */<br>
\ No newline at end of file<br>
+  */<br>
diff --git a/bsps/mips/shared/doxygen.h b/bsps/mips/shared/doxygen.h<br>
index 755675fc4d..439f0b82a5 100644<br>
--- a/bsps/mips/shared/doxygen.h<br>
+++ b/bsps/mips/shared/doxygen.h<br>
@@ -1,11 +1,13 @@<br>
-  /**<br>
-  *  @defgroup bsp_mips MIPS<br>
-  *  @ingroup bsp_kit<br>
-  *  @brief MIPS Board Support Packages<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsMIPS MIPS<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief MIPS Board Support Packages.<br>
+ */<br>
<br>
  /**<br>
   *  @defgroup mips_shared MIPS Shared Modules<br>
-  *  @ingroup bsp_mips<br>
+  *  @ingroup RTEMSBSPsMIPS<br>
   *  @brief mips Shared Modules<br>
   */<br>
diff --git a/bsps/moxie/shared/doxygen.h b/bsps/moxie/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..e60a556d28<br>
--- /dev/null<br>
+++ b/bsps/moxie/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsMoxie Moxie<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Moxie Board Support Packages.<br>
+ */<br>
diff --git a/bsps/nios2/shared/doxygen.h b/bsps/nios2/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..5dd48fb2b2<br>
--- /dev/null<br>
+++ b/bsps/nios2/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsNios2 Nios II (nios2)<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Nios II Board Support Packages.<br>
+ */<br>
diff --git a/bsps/no_cpu/shared/doxygen.h b/bsps/no_cpu/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..4d2f5f96d3<br>
--- /dev/null<br>
+++ b/bsps/no_cpu/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsNoCPU Example<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief Example Board Support Package.<br>
+ */<br>
diff --git a/bsps/or1k/shared/doxygen.h b/bsps/or1k/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..5025c13fae<br>
--- /dev/null<br>
+++ b/bsps/or1k/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsOR1K OpenRISC 1000 (or1k)<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief OpenRISC 1000 Board Support Packages.<br>
+ */<br>
diff --git a/bsps/powerpc/include/bsp/vmeUniverse.h b/bsps/powerpc/include/bsp/vmeUniverse.h<br>
index 7cb9f8d2de..7f68096e25 100644<br>
--- a/bsps/powerpc/include/bsp/vmeUniverse.h<br>
+++ b/bsps/powerpc/include/bsp/vmeUniverse.h<br>
@@ -57,8 +57,6 @@<br>
 /**<br>
  *  @defgroup shared_vmeuniverse Register definitions<br>
  *<br>
- *  @ingroup bsp_shared<br>
- *<br>
  *  @brief all registers contents in PCI space are LITTLE ENDIAN<br>
  */<br>
<br>
diff --git a/bsps/powerpc/mvme3100/doxygen.h b/bsps/powerpc/mvme3100/doxygen.h<br>
deleted file mode 100644<br>
index 59ae7ef00e..0000000000<br>
--- a/bsps/powerpc/mvme3100/doxygen.h<br>
+++ /dev/null<br>
@@ -1,15 +0,0 @@<br>
-/**<br>
- *  @defgroup bsp_powerpc POWERPC<br>
- *<br>
- *  @ingroup bsp_kit<br>
- *<br>
- *  @brief POWERPC Board Support Packages<br>
- */<br>
-<br>
-/**<br>
- *  @defgroup powerpc_mvme3100 POWERPC MVME3100 Modules<br>
- *<br>
- *  @ingroup bsp_powerpc<br>
- *<br>
- *  @brief POWERPC MVME3100 Modules<br>
- */<br>
\ No newline at end of file<br>
diff --git a/bsps/powerpc/shared/doxygen.h b/bsps/powerpc/shared/doxygen.h<br>
index 30c616e5d4..6638615989 100644<br>
--- a/bsps/powerpc/shared/doxygen.h<br>
+++ b/bsps/powerpc/shared/doxygen.h<br>
@@ -1,10 +1,10 @@<br>
-  /**<br>
-  *  @defgroup bsp_powerpc PowerPC<br>
-  *<br>
-  *  @ingroup bsp_kit<br>
-  *<br>
-  *  @brief PowerPC Board Support Packages<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsPowerPc PowerPC<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief PowerPC Board Support Packages.<br>
+ */<br>
<br>
  /**<br>
   *  @defgroup powerpc_shared PowerPC Shared Modules<br>
diff --git a/bsps/powerpc/shared/vme/doxygen.h b/bsps/powerpc/shared/vme/doxygen.h<br>
index 88ded941ac..2ccdeda9dd 100644<br>
--- a/bsps/powerpc/shared/vme/doxygen.h<br>
+++ b/bsps/powerpc/shared/vme/doxygen.h<br>
@@ -1,7 +1,5 @@<br>
 /**<br>
  *  @defgroup shared_vmeuniverse SHARED VMEUNIVERSE Modules<br>
  *<br>
- *  @ingroup bsp_shared<br>
- *<br>
  *  @brief SHARED VMEUNIVERSE Modules<br>
- */<br>
\ No newline at end of file<br>
+ */<br>
diff --git a/bsps/riscv/shared/doxygen.h b/bsps/riscv/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..c7712eefca<br>
--- /dev/null<br>
+++ b/bsps/riscv/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsRISCV RISC-V<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief RISC-V Board Support Packages.<br>
+ */<br>
diff --git a/bsps/sh/shared/doxygen.h b/bsps/sh/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..ae5d985f81<br>
--- /dev/null<br>
+++ b/bsps/sh/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsSH SuperH (sh)<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief SuperH Board Support Packages.<br>
+ */<br>
diff --git a/bsps/shared/dev/clock/clockimpl.h b/bsps/shared/dev/clock/clockimpl.h<br>
index f3a41b1480..7913cde28c 100644<br>
--- a/bsps/shared/dev/clock/clockimpl.h<br>
+++ b/bsps/shared/dev/clock/clockimpl.h<br>
@@ -32,7 +32,7 @@<br>
 /**<br>
  * @defgroup bsp_clock Clock Support<br>
  *<br>
- * @ingroup bsp_shared<br>
+ * @ingroup RTEMSBSPsShared<br>
  *<br>
  * @brief Clock support <br>
  *<br>
diff --git a/bsps/shared/doxygen.h b/bsps/shared/doxygen.h<br>
index bbc7bb972f..538ed9e8b1 100644<br>
--- a/bsps/shared/doxygen.h<br>
+++ b/bsps/shared/doxygen.h<br>
@@ -1,15 +1,14 @@<br>
 /**<br>
- *  @defgroup bsp_shared SHARED<br>
+ * @defgroup RTEMSBSPs Board Support Packages<br>
  *<br>
- *  @ingroup bsp_kit<br>
- *<br>
- *  @brief SHARED Board Support Packages<br>
+ * @brief Board Support Packages and Support Modules<br>
+ * (BSPs).<br>
  */<br>
<br>
 /**<br>
- *  @defgroup shared_tod SHARED TOD Modules<br>
+ * @defgroup RTEMSBSPsShared Shared<br>
  *<br>
- *  @ingroup bsp_shared<br>
+ * @ingroup RTEMSBSPs<br>
  *<br>
- *  @brief SHARED TOD Modules<br>
- */<br>
\ No newline at end of file<br>
+ * @brief Shared Support for Board Support Packages<br>
+ */<br>
diff --git a/bsps/shared/start/bootcard.c b/bsps/shared/start/bootcard.c<br>
index 83030f29ba..542785bd83 100644<br>
--- a/bsps/shared/start/bootcard.c<br>
+++ b/bsps/shared/start/bootcard.c<br>
@@ -1,20 +1,7 @@<br>
 /**<br>
  * @file<br>
  *<br>
- * @ingroup bsp_bootcard<br>
- *<br>
- * @brief Standard system startup.<br>
- *<br>
- *  This is the C entry point for ALL RTEMS BSPs.  It is invoked<br>
- *  from the assembly language initialization file usually called<br>
- *  start.S.  It provides the framework for the BSP initialization<br>
- *  sequence.  For the basic flow of initialization see RTEMS C User's Guide,<br>
- *  Initialization Manager.<br>
- *<br>
- *  This style of initialization ensures that the C++ global<br>
- *  constructors are executed after RTEMS is initialized.<br>
- *  Thanks to Chris Johns <<a href="mailto:cjohns@plessey.com.au" target="_blank">cjohns@plessey.com.au</a>> for the idea<br>
- *  to move C++ global constructors into the first task.<br>
+ * @ingroup RTEMSBSPsSharedStartup<br>
  */<br>
<br>
 /*<br>
diff --git a/bsps/shared/start/stackalloc.c b/bsps/shared/start/stackalloc.c<br>
index 3e3b83e95e..f7cf7be0f1 100644<br>
--- a/bsps/shared/start/stackalloc.c<br>
+++ b/bsps/shared/start/stackalloc.c<br>
@@ -1,7 +1,7 @@<br>
 /**<br>
  * @file<br>
  *<br>
- * @ingroup bsp_shared<br>
+ * @ingroup bsp_stack<br>
  *<br>
  * @brief Stack initialization, allocation and free functions.<br>
  */<br>
diff --git a/bsps/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h<br>
index 71719f9cf3..2941db0be4 100644<br>
--- a/bsps/sparc/erc32/include/bsp.h<br>
+++ b/bsps/sparc/erc32/include/bsp.h<br>
@@ -39,7 +39,7 @@ extern "C" {<br>
 /**<br>
  * @defgroup sparc_erc32 ERC32 Support<br>
  *<br>
- * @ingroup bsp_sparc<br>
+ * @ingroup RTEMSBSPsSPARC<br>
  *<br>
  * @brief ERC32 Support Package<br>
  */<br>
diff --git a/bsps/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h<br>
index e9b98492d7..82f7728ff9 100644<br>
--- a/bsps/sparc/leon2/include/bsp.h<br>
+++ b/bsps/sparc/leon2/include/bsp.h<br>
@@ -42,7 +42,7 @@ extern "C" {<br>
 /**<br>
  *  @defgroup sparc_leon2 LEON2 Support<br>
  *<br>
- *  @ingroup bsp_sparc<br>
+ *  @ingroup RTEMSBSPsSPARC<br>
  *<br>
  *  @brief LEON2 Support Package<br>
  *<br>
diff --git a/bsps/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h<br>
index 3fda4edc66..c35e537d0a 100644<br>
--- a/bsps/sparc/leon3/include/bsp.h<br>
+++ b/bsps/sparc/leon3/include/bsp.h<br>
@@ -42,7 +42,7 @@ extern "C" {<br>
 /**<br>
  *  @defgroup sparc_leon3 LEON3 Support<br>
  *<br>
- *  @ingroup bsp_sparc<br>
+ *  @ingroup RTEMSBSPsSPARC<br>
  *<br>
  *  @brief LEON3 support package<br>
  *<br>
diff --git a/bsps/sparc/shared/doxygen.h b/bsps/sparc/shared/doxygen.h<br>
index be0b7d672e..a5907d281c 100644<br>
--- a/bsps/sparc/shared/doxygen.h<br>
+++ b/bsps/sparc/shared/doxygen.h<br>
@@ -1,15 +1,15 @@<br>
- /**<br>
-  *  @defgroup bsp_sparc SPARC<br>
-  *<br>
-  *  @ingroup bsp_kit<br>
-  *<br>
-  *  @brief SPARC Board Support Packages<br>
-  */<br>
+/**<br>
+ * @defgroup RTEMSBSPsSPARC SPARC<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief SPARC Board Support Packages.<br>
+ */<br>
<br>
  /**<br>
   *  @defgroup sparc_shared SPARC Shared Modules<br>
   *<br>
-  *  @ingroup bsp_sparc<br>
+  *  @ingroup RTEMSBSPsSPARC<br>
   *<br>
   *  @brief SPARC Shared Modules<br>
   */<br>
diff --git a/bsps/sparc64/shared/doxygen.h b/bsps/sparc64/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..0bfccebf9f<br>
--- /dev/null<br>
+++ b/bsps/sparc64/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsSPARC64 SPARC64<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief SPARC64 Board Support Packages.<br>
+ */<br>
diff --git a/bsps/v850/shared/doxygen.h b/bsps/v850/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..beaaa35275<br>
--- /dev/null<br>
+++ b/bsps/v850/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsV850 V850<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief V850 Board Support Packages.<br>
+ */<br>
diff --git a/bsps/x86_64/shared/doxygen.h b/bsps/x86_64/shared/doxygen.h<br>
new file mode 100644<br>
index 0000000000..6d0e46428c<br>
--- /dev/null<br>
+++ b/bsps/x86_64/shared/doxygen.h<br>
@@ -0,0 +1,7 @@<br>
+/**<br>
+ * @defgroup RTEMSBSPsX8664 x86-64<br>
+ *<br>
+ * @ingroup RTEMSBSPs<br>
+ *<br>
+ * @brief x86-64 Board Support Packages.<br>
+ */<br>
-- <br>
2.16.4<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div>