diff --git a/boards/khadas/edge2/doc/index.rst b/boards/khadas/edge2/doc/index.rst
index 337ff3aa24e..f53dcc2744d 100644
--- a/boards/khadas/edge2/doc/index.rst
+++ b/boards/khadas/edge2/doc/index.rst
@@ -17,23 +17,7 @@ See `Hardware details`_
 Supported Features
 ==================
 
-The ``khadas_edge2`` board target supports the following
-hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| GIC-600   | on-chip    | GICv3 interrupt controller           |
-+-----------+------------+--------------------------------------+
-| ARM TIMER | on-chip    | System Clock                         |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | Synopsys DesignWare 8250 serial port |
-+-----------+------------+--------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in (NON-SMP)
-:zephyr_file:`boards/khadas/edge2/khadas_edge2_defconfig`
+.. zephyr:board-supported-hw::
 
 There are multiple serial ports on the board: Zephyr is using
 uart2 as serial console.
diff --git a/boards/khadas/edgev/doc/index.rst b/boards/khadas/edgev/doc/index.rst
index 82294c07e99..babd23d834d 100644
--- a/boards/khadas/edgev/doc/index.rst
+++ b/boards/khadas/edgev/doc/index.rst
@@ -13,23 +13,7 @@ See <https://docs.khadas.com/linux/edge/Hardware.html#Edge-V-1>
 Supported Features
 ==================
 
-Khadas Edge-V board default configuration supports the following
-hardware features:
-
-+-----------+------------+--------------------------------------+
-| Interface | Controller | Driver/Component                     |
-+===========+============+======================================+
-| GIC-500   | on-chip    | GICv3 interrupt controller           |
-+-----------+------------+--------------------------------------+
-| ARM TIMER | on-chip    | System Clock                         |
-+-----------+------------+--------------------------------------+
-| UART      | on-chip    | Synopsys DesignWare 8250 serial port |
-+-----------+------------+--------------------------------------+
-
-Other hardware features have not been enabled yet for this board.
-
-The default configuration can be found in (NON-SMP)
-:zephyr_file:`boards/khadas/edgev/khadas_edgev_defconfig`
+.. zephyr:board-supported-hw::
 
 There are multiple serial ports on the board: Zephyr is using
 uart2 as serial console.