6 files changed, 14 insertions, 14 deletions
diff --git a/bsps/or1k/generic_or1k/btimer/btimer.c b/bsps/or1k/generic_or1k/btimer/btimer.c
index 872f1af7be..d665fb66cf 100644
--- a/bsps/or1k/generic_or1k/btimer/btimer.c
+++ b/bsps/or1k/generic_or1k/btimer/btimer.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup generic_or1k
+ * @ingroup RTEMSBSPsOR1K
  *
  * @brief Benchmark timer support.
  */
diff --git a/bsps/or1k/generic_or1k/include/bsp.h b/bsps/or1k/generic_or1k/include/bsp.h
index 16839930a4..3a6dd2ee71 100644
--- a/bsps/or1k/generic_or1k/include/bsp.h
+++ b/bsps/or1k/generic_or1k/include/bsp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup generic_or1k
+ * @ingroup RTEMSBSPsOR1K
  *
  * @brief Global BSP definitions.
  */
@@ -17,6 +17,12 @@
 #ifndef LIBBSP_GENERIC_OR1K_H
 #define LIBBSP_GENERIC_OR1K_H
 
+/**
+ * @addtogroup RTEMSBSPsOR1K
+ *
+ * @{
+ */
+
 #include <bspopts.h>
 #include <rtems.h>
 #include <bsp/generic_or1k.h>
@@ -33,13 +39,7 @@ extern "C" {
 }
 #endif /* __cplusplus */
 
+/** @} */
+
 #endif /* LIBBSP_GENERIC_OR1K_H */
 
-/**
- * @defgroup generic_or1k support
- *
- * @ingroup bsp_or1k
- *
- * @brief generic_or1k support package
- *
- */
diff --git a/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h b/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
index e4d9760640..901e9acac1 100644
--- a/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
+++ b/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
@@ -22,7 +22,7 @@
 /**
  * @defgroup generic_or1k_reg Register Definitions
  *
- * @ingroup generic_or1k
+ * @ingroup RTEMSBSPsOR1K
  *
  * @brief Shared register definitions for or1k systems.
  *
diff --git a/bsps/or1k/generic_or1k/include/bsp/uart.h b/bsps/or1k/generic_or1k/include/bsp/uart.h
index dbf3bbf9ef..7cfe38f087 100644
--- a/bsps/or1k/generic_or1k/include/bsp/uart.h
+++ b/bsps/or1k/generic_or1k/include/bsp/uart.h
@@ -17,7 +17,7 @@
 /**
  * @defgroup generic_or1k_uart UART Support
  *
- * @ingroup generic_or1k
+ * @ingroup RTEMSBSPsOR1K
  *
  * @brief Universal Asynchronous Receiver/Transmitter (UART) Support
  */
diff --git a/bsps/or1k/generic_or1k/start/bspstart.c b/bsps/or1k/generic_or1k/start/bspstart.c
index 35a536ef0b..5950d4cbeb 100644
--- a/bsps/or1k/generic_or1k/start/bspstart.c
+++ b/bsps/or1k/generic_or1k/start/bspstart.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup generic_or1k
+ * @ingroup RTEMSBSPsOR1K
  *
  * @brief Benchmark timer support.
  */
diff --git a/bsps/or1k/shared/doxygen.h b/bsps/or1k/shared/doxygen.h
index 5025c13fae..d380bfa744 100644
--- a/bsps/or1k/shared/doxygen.h
+++ b/bsps/or1k/shared/doxygen.h
@@ -3,5 +3,5 @@
  *
  * @ingroup RTEMSBSPs
  *
- * @brief OpenRISC 1000 Board Support Packages.
+ * @brief OpenRISC 1000 Board Support Package.
  */