diff --git a/boards/nucleo-common/include/board_common.h b/boards/nucleo-common/include/board_common.h
index b4315667a717ea7a0e3d9eb7eac80dd301ab8824..5d7c732b0a05ceeae76a5307366fa34c0891844e 100644
--- a/boards/nucleo-common/include/board_common.h
+++ b/boards/nucleo-common/include/board_common.h
@@ -7,9 +7,15 @@
*/
/**
- * @defgroup boards_nucleo_common STM Nucleo Common
+ * @defgroup boards_nucleo STM Nucleo boards
* @ingroup boards
- * @brief Common files for STM Nucleo boards
+ * @brief STM Nucleo boards
+ */
+
+/**
+ * @defgroup boards_nucleo64_common STM Nucleo 64 boards common
+ * @ingroup boards_nucleo
+ * @brief Common files for STM Nucleo 64 boards
* @{
*
* @file
diff --git a/boards/nucleo-f030/include/board.h b/boards/nucleo-f030/include/board.h
index 19f4b475572a5d7e110ae419b0efc355681534a0..0144d1c7b4db3ae27dd89284925158a2d4427a7d 100644
--- a/boards/nucleo-f030/include/board.h
+++ b/boards/nucleo-f030/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f030 Nucleo-F030
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f030 board
* @{
*
diff --git a/boards/nucleo-f070/include/board.h b/boards/nucleo-f070/include/board.h
index 3da4a940581be0f5cf8b3f9a0d19e19acb740fb3..a382ef671ac3c7371d16ae6a32545d58d7459fc4 100644
--- a/boards/nucleo-f070/include/board.h
+++ b/boards/nucleo-f070/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo-f072 Nucleo-F072
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f072 board
* @{
*
diff --git a/boards/nucleo-f072/include/board.h b/boards/nucleo-f072/include/board.h
index a69850e219085b94d4f4f916cff607df9b87747a..c0cd12e474e0f8562bb0b4179c61445169d91a4c 100644
--- a/boards/nucleo-f072/include/board.h
+++ b/boards/nucleo-f072/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f072 Nucleo-F072
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f072 board
* @{
*
diff --git a/boards/nucleo-f091/include/board.h b/boards/nucleo-f091/include/board.h
index 54669ce6993d959a1664fcf0306cc8d4ed1f7a17..e08507d489da9dfad162b5b2855de40f80be9f13 100644
--- a/boards/nucleo-f091/include/board.h
+++ b/boards/nucleo-f091/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f091 Nucleo-F091
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f091 board
* @{
*
diff --git a/boards/nucleo-f103/include/board.h b/boards/nucleo-f103/include/board.h
index 086bb2a9bcaaf3179f489e0fba5ee775aea2ce7d..17f2bcdbe51ef678fc6920799efb280186ed4d4a 100755
--- a/boards/nucleo-f103/include/board.h
+++ b/boards/nucleo-f103/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f103 Nucleo-F103
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f103 board
* @{
*
diff --git a/boards/nucleo-f302/include/board.h b/boards/nucleo-f302/include/board.h
index bac65240bac7cdde4f28646c71a845e399476ccd..1885346bd983407dbd7f09d279f6a99c21bb96e2 100755
--- a/boards/nucleo-f302/include/board.h
+++ b/boards/nucleo-f302/include/board.h
@@ -10,7 +10,7 @@
/**
* @defgroup boards_nucleo-f302 Nucleo-F302
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f302 board
* @{
*
diff --git a/boards/nucleo-f303/include/board.h b/boards/nucleo-f303/include/board.h
index 80bd0cfa648a4ac10a09e8b52a733db23fa47e30..8735fa41898903cef3e04e07879bcfe24f3dbb22 100755
--- a/boards/nucleo-f303/include/board.h
+++ b/boards/nucleo-f303/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo-f303 Nucleo-F303
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f303 board
* @{
*
diff --git a/boards/nucleo-f334/include/board.h b/boards/nucleo-f334/include/board.h
index 5bc8846ed33b938698c206c6133720d9e5094fda..502f279eb481fb38557666211550f815f0f3dbca 100644
--- a/boards/nucleo-f334/include/board.h
+++ b/boards/nucleo-f334/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f334 Nucleo-F334
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f334 board
* @{
*
diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h
index 564cfc6f8755725a66dee344c1d2926168f6f6d7..634e08346aadd57b0595a0ec3027621c9ecef314 100644
--- a/boards/nucleo-f401/include/board.h
+++ b/boards/nucleo-f401/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f401 Nucleo-F401
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f401 board
* @{
*
diff --git a/boards/nucleo-f410/include/board.h b/boards/nucleo-f410/include/board.h
index ba781a382ff10ae80c3a9e27ac8bb321b742727a..e7caa303706d66adb6d8b90b6f2005e860fb1947 100644
--- a/boards/nucleo-f410/include/board.h
+++ b/boards/nucleo-f410/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f410 Nucleo-F410
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f410 board
* @{
*
diff --git a/boards/nucleo-f411/include/board.h b/boards/nucleo-f411/include/board.h
index 7c822ac487cd74ef877e9c5cfc567cbd4aba5292..49aa83ba1135cec6a00ee93005c8ce419aef2b9b 100644
--- a/boards/nucleo-f411/include/board.h
+++ b/boards/nucleo-f411/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f411 Nucleo-F411
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f411 board
* @{
*
diff --git a/boards/nucleo-f446/include/board.h b/boards/nucleo-f446/include/board.h
index 8b1b0ae16ff59c1891fce25089628bd6ea1a01d5..68bf2f5b6fed6c13f0ad365cfa8917217750c4af 100644
--- a/boards/nucleo-f446/include/board.h
+++ b/boards/nucleo-f446/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-f446 Nucleo-F446
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-f446 board
* @{
*
diff --git a/boards/nucleo-l053/include/board.h b/boards/nucleo-l053/include/board.h
index a2840657b7e4bafd0df0efb6c4829cc8bd355cf1..f205f7d9bc60acf2a717f7e11c33e5e6b19b97a2 100644
--- a/boards/nucleo-l053/include/board.h
+++ b/boards/nucleo-l053/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo-l053 Nucleo-L053
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-l053 board
* @{
*
diff --git a/boards/nucleo-l073/include/board.h b/boards/nucleo-l073/include/board.h
index 803bc5cb7ffa86c90c5923a840aa12bee6bfd270..17fcd86fc7230dc17b6e5a5b05235ff250a0df7c 100644
--- a/boards/nucleo-l073/include/board.h
+++ b/boards/nucleo-l073/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo-l073 Nucleo-L073
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-l073 board
* @{
*
diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h
index 7d061fd80413c80521f6db07d5c4dca15df8a273..2048c1e92824da9087c8cd1998b696244f13b447 100644
--- a/boards/nucleo-l1/include/board.h
+++ b/boards/nucleo-l1/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo-l1 Nucleo-L1
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-l1 board.
* @{
*
diff --git a/boards/nucleo-l476/include/board.h b/boards/nucleo-l476/include/board.h
index b9e442b6a56156877a383d4f3501db0cee5bc397..cb05ddc4d6e95e3b10753b01aa01fd7d74a97eb7 100644
--- a/boards/nucleo-l476/include/board.h
+++ b/boards/nucleo-l476/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo-l476 Nucleo-L476
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo-l476 board
* @{
*
diff --git a/boards/nucleo144-common/include/board_common.h b/boards/nucleo144-common/include/board_common.h
index e0ade1b9583b8c41d8d3bb2331432e74e9f27fe0..f4bc572cfb4c7d33fd467b4de1df7ee689cda247 100644
--- a/boards/nucleo144-common/include/board_common.h
+++ b/boards/nucleo144-common/include/board_common.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo144-common STM Nucleo-144 Common
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Common files for STM Nucleo-144 boards
* @{
*
diff --git a/boards/nucleo144-f207/include/board.h b/boards/nucleo144-f207/include/board.h
index 38d38ed3727207a2e7da64bb23a2b16cc4272bd0..f1c67df60f8d5b53ed96460b9d75cfdf01eb87d9 100644
--- a/boards/nucleo144-f207/include/board.h
+++ b/boards/nucleo144-f207/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f207 Nucleo144-F207
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f207 board
* @{
*
diff --git a/boards/nucleo144-f303/include/board.h b/boards/nucleo144-f303/include/board.h
index 819921094383a0bbeda26f1a53e397478f065f15..cb1f9b309b3404ee0f37630ea599b8e178cb0f11 100644
--- a/boards/nucleo144-f303/include/board.h
+++ b/boards/nucleo144-f303/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f303 Nucleo144-F303
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f303 board
* @{
*
diff --git a/boards/nucleo144-f412/include/board.h b/boards/nucleo144-f412/include/board.h
index 6195f9f1cc9640c3c6022dbc6e3b515d4abb9721..d080cb64c09688d50712ad2a53c0f75b49a346af 100644
--- a/boards/nucleo144-f412/include/board.h
+++ b/boards/nucleo144-f412/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo144-f412 Nucleo-F412
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f412 board
* @{
*
diff --git a/boards/nucleo144-f413/include/board.h b/boards/nucleo144-f413/include/board.h
index 6de395122be3bb54d8517e7d7f91810dba18592d..5d268051ddbe0bf1da4c2deec4c0511486e68d0a 100644
--- a/boards/nucleo144-f413/include/board.h
+++ b/boards/nucleo144-f413/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo144-f413 Nucleo-F413
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f413 board
* @{
*
diff --git a/boards/nucleo144-f429/include/board.h b/boards/nucleo144-f429/include/board.h
index 27c88a1b4dbdfac36f2dbd46fbab6bd7bae44aa1..4e2acb9f6493c10531ab1dfffc54ba8f6778584c 100644
--- a/boards/nucleo144-f429/include/board.h
+++ b/boards/nucleo144-f429/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f429 Nucleo144-F429
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f429 board
* @{
*
diff --git a/boards/nucleo144-f446/include/board.h b/boards/nucleo144-f446/include/board.h
index 94a322f80aa21bbab8810442c955f87f4113b74c..1464f30cf28e1657fe4d44fd971cbdab9e0885c0 100644
--- a/boards/nucleo144-f446/include/board.h
+++ b/boards/nucleo144-f446/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f446 Nucleo144-F446
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f446 board
* @{
*
diff --git a/boards/nucleo144-f746/include/board.h b/boards/nucleo144-f746/include/board.h
index 8da0851e161c79caa809b3906aa3338a8bcd8cd3..4de9f3e647285f8b8bb40a13af85876cb8173730 100644
--- a/boards/nucleo144-f746/include/board.h
+++ b/boards/nucleo144-f746/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f746 Nucleo144-F746
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f746 board
* @{
*
diff --git a/boards/nucleo144-f767/include/board.h b/boards/nucleo144-f767/include/board.h
index 244924de4a9392b92704ea000cd219612c733e68..5b7ed437a3f2c538a0e173de53d3c03699ec9fe0 100644
--- a/boards/nucleo144-f767/include/board.h
+++ b/boards/nucleo144-f767/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo144-f767 Nucleo144-F767
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo144-f767 board
* @{
*
diff --git a/boards/nucleo32-common/include/board_common.h b/boards/nucleo32-common/include/board_common.h
index ef71de382d6bf44158116811df0b65cfba61be92..895ea0b3ee81e778af03758826ca76e6894ea62f 100644
--- a/boards/nucleo32-common/include/board_common.h
+++ b/boards/nucleo32-common/include/board_common.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo32-common STM Nucleo-32 Common
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Common files for STM Nucleo-32 boards
* @{
*
diff --git a/boards/nucleo32-f031/include/board.h b/boards/nucleo32-f031/include/board.h
index e06c9370e3a5b4b8f220df0a1518f922a652a5c8..95498955120f83533bae8e5498de46eafcf8c75f 100644
--- a/boards/nucleo32-f031/include/board.h
+++ b/boards/nucleo32-f031/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo32-f031 Nucleo32-F031
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo32-f031 board
* @{
*
diff --git a/boards/nucleo32-f042/include/board.h b/boards/nucleo32-f042/include/board.h
index 5ea9e91494fadd0de288bec3ad199da46f88dee0..6f2955c041f7dc3c83cc8cd8ee629b0095b61690 100644
--- a/boards/nucleo32-f042/include/board.h
+++ b/boards/nucleo32-f042/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo32-f042 Nucleo-F042
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo32-f042 board
* @{
*
diff --git a/boards/nucleo32-f303/include/board.h b/boards/nucleo32-f303/include/board.h
index 435982eaba98d546f06e5326cea9d86c04cf4283..090b7a940e2946d89f5803db2283de5235b88970 100644
--- a/boards/nucleo32-f303/include/board.h
+++ b/boards/nucleo32-f303/include/board.h
@@ -8,7 +8,7 @@
/**
* @defgroup boards_nucleo32-f303 Nucleo32-F303
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo32-f303 board
* @{
*
diff --git a/boards/nucleo32-l031/include/board.h b/boards/nucleo32-l031/include/board.h
index 8698f533752a3ed7fdbfa0dcaea085ce78b0198f..ce03dbc44451db0d7130b4f6e42fe9926040afc4 100644
--- a/boards/nucleo32-l031/include/board.h
+++ b/boards/nucleo32-l031/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo32-l031 Nucleo32-L031
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo32-l031 board
* @{
*
diff --git a/boards/nucleo32-l432/include/board.h b/boards/nucleo32-l432/include/board.h
index d1dfc0631c1a9cd9ef6f5fe36becfb3837c95163..6b9a8af0957decdf836fb1ad04ec52816d196bfd 100644
--- a/boards/nucleo32-l432/include/board.h
+++ b/boards/nucleo32-l432/include/board.h
@@ -9,7 +9,7 @@
/**
* @defgroup boards_nucleo32-l432 Nucleo32-L432
- * @ingroup boards
+ * @ingroup boards_nucleo
* @brief Board specific files for the nucleo32-l432 board
* @{
*