11 files changed, 23 insertions, 31 deletions
diff --git a/bsps/arm/lpc32xx/include/bsp.h b/bsps/arm/lpc32xx/include/bsp.h
index a91f92bd35..c0d8c9edfe 100644
--- a/bsps/arm/lpc32xx/include/bsp.h
+++ b/bsps/arm/lpc32xx/include/bsp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Global BSP definitions.
  */
@@ -23,6 +23,16 @@
 #ifndef LIBBSP_ARM_LPC32XX_BSP_H
 #define LIBBSP_ARM_LPC32XX_BSP_H
 
+/**
+ * @defgroup RTEMSBSPsARMLPC32XX NXP LPC32XX
+ *
+ * @ingroup RTEMSBSPsARM
+ *
+ * @brief NXP LPC32XX Board Support Package.
+ *
+ * @{
+ */
+
 #include <bspopts.h>
 
 #define BSP_FEATURE_IRQ_EXTENSION
@@ -41,16 +51,6 @@ extern "C" {
 struct rtems_bsdnet_ifconfig;
 
 /**
- * @defgroup arm_lpc32xx LPC32XX Support
- *
- * @ingroup RTEMSBSPsARM
- *
- * @brief LPC32XX support package.
- *
- * @{
- */
-
-/**
  * @brief Network driver attach and detach function.
  */
 int lpc_eth_attach_detach(
@@ -241,20 +241,12 @@ extern uint32_t lpc32xx_magic_zero_size [];
     ); \
   } while (0)
 
-/** @} */
-
-/**
- * @defgroup lpc LPC Support
- *
- * @ingroup arm_lpc32xx
- *
- * @brief LPC support package.
- */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* ASM */
 
+/** @} */
+
 #endif /* LIBBSP_ARM_LPC32XX_BSP_H */
diff --git a/bsps/arm/lpc32xx/include/bsp/boot.h b/bsps/arm/lpc32xx/include/bsp/boot.h
index b9c845bc8f..cb4c92428b 100644
--- a/bsps/arm/lpc32xx/include/bsp/boot.h
+++ b/bsps/arm/lpc32xx/include/bsp/boot.h
@@ -33,7 +33,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_boot Boot Support
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Boot support.
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/hsu.h b/bsps/arm/lpc32xx/include/bsp/hsu.h
index ba97dfb423..c4248cb7ab 100644
--- a/bsps/arm/lpc32xx/include/bsp/hsu.h
+++ b/bsps/arm/lpc32xx/include/bsp/hsu.h
@@ -32,7 +32,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_hsu HSU Support
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief HSU Support
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/i2c.h b/bsps/arm/lpc32xx/include/bsp/i2c.h
index e0bf8349ac..18433dfaad 100644
--- a/bsps/arm/lpc32xx/include/bsp/i2c.h
+++ b/bsps/arm/lpc32xx/include/bsp/i2c.h
@@ -33,7 +33,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_i2c I2C Support
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief I2C Support
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/irq.h b/bsps/arm/lpc32xx/include/bsp/irq.h
index fbb13b5262..1eef140faf 100644
--- a/bsps/arm/lpc32xx/include/bsp/irq.h
+++ b/bsps/arm/lpc32xx/include/bsp/irq.h
@@ -35,7 +35,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_interrupt Interrupt Support
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @ingroup bsp_interrupt
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
index 2b676b433f..2a2d3f82e2 100644
--- a/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
@@ -33,7 +33,7 @@ extern "C" {
 /**
  * @defgroup lpc_clock Clock Support
  *
- * @ingroup lpc
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Clock support.
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
index 53e9e8415d..88dc11525e 100644
--- a/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
@@ -38,7 +38,7 @@ extern "C" {
 /**
  * @defgroup lpc_eth Ethernet Support
  *
- * @ingroup lpc
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Ethernet support.
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/lpc32xx.h b/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
index 2edb1e334e..42ec31a89b 100644
--- a/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
@@ -33,7 +33,7 @@
 /**
  * @defgroup lpc32xx_reg Register Definitions
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Register definitions.
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/mmu.h b/bsps/arm/lpc32xx/include/bsp/mmu.h
index 32352b5ed9..7d46470622 100644
--- a/bsps/arm/lpc32xx/include/bsp/mmu.h
+++ b/bsps/arm/lpc32xx/include/bsp/mmu.h
@@ -32,7 +32,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_mmu MMU Support
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief MMU support.
  *
diff --git a/bsps/arm/lpc32xx/include/bsp/nand-mlc.h b/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
index 2aa8312945..39dd2e291b 100644
--- a/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
+++ b/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
@@ -36,7 +36,7 @@ extern "C" {
 /**
  * @defgroup lpc32xx_nand_mlc NAND MLC Controller
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief NAND MLC Controller.
  *
diff --git a/bsps/arm/lpc32xx/include/tm27.h b/bsps/arm/lpc32xx/include/tm27.h
index a7cc2dd802..6176a75c71 100644
--- a/bsps/arm/lpc32xx/include/tm27.h
+++ b/bsps/arm/lpc32xx/include/tm27.h
@@ -1,6 +1,6 @@
 /* @file
  *
- * @ingroup arm_lpc32xx
+ * @ingroup RTEMSBSPsARMLPC32XX
  *
  * @brief Implementations of interrupt mechanisms for Time Test 27
  */