* [PATCH v3 1/7] scripts: Check F: entries in all MAINTAINERS files
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-10 20:03 ` [PATCH v3 2/7] MAINTAINERS: tegra: Update and correct entries Tom Rini
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
From: Michal Simek <michal.simek@amd.com>
Extend the checker to walk every MAINTAINERS file in the tree instead of
only the top-level one, so stale F: references in the per-board and
per-driver MAINTAINERS files are caught too.
Use git ls-files to enumerate the MAINTAINERS files so that only tracked
files are checked, ignored build artifacts are skipped and paths are
reported relative to the repository root. Fall back to find when running
outside a git checkout.
MAINTAINERS files under tools/buildman/ are skipped as they are test
fixtures whose F: paths are relative to the test setup rather than the
repository root.
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
scripts/check_maintainers_files.sh | 80 ++++++++++++++++++++----------
1 file changed, 53 insertions(+), 27 deletions(-)
diff --git a/scripts/check_maintainers_files.sh b/scripts/check_maintainers_files.sh
index 4c1279958e98..ccac97a2d93e 100755
--- a/scripts/check_maintainers_files.sh
+++ b/scripts/check_maintainers_files.sh
@@ -1,44 +1,70 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
#
-# Check that every "F:" file reference in MAINTAINERS exists.
+# Check that every "F:" file reference in the MAINTAINERS files exists.
#
-# Each F: entry is treated as a shell glob (relative to the repo root),
-# matching the way MAINTAINERS wildcards work. If a pattern matches no
-# existing file or directory, it is reported and the script exits non-zero.
+# Every MAINTAINERS file in the tree is checked (the top-level one plus the
+# per-board/per-driver MAINTAINERS files). All F: paths are interpreted
+# relative to the repository root and are treated as shell globs, matching the
+# way MAINTAINERS wildcards work. If a pattern matches no existing file or
+# directory it is reported and the script exits non-zero.
set -u
-MAINTAINERS="${1:-MAINTAINERS}"
+# Move to the repository root so that F: globs (which are root relative)
+# resolve correctly regardless of where the script is invoked from.
+if root=$(git rev-parse --show-toplevel 2>/dev/null); then
+ cd "$root" || exit 2
+fi
-if [ ! -f "$MAINTAINERS" ]; then
- echo "error: cannot find $MAINTAINERS" >&2
- exit 2
+# Collect the list of MAINTAINERS files to check. Newlines separate entries;
+# MAINTAINERS paths never contain spaces.
+set -f
+IFS='
+'
+if list=$(git ls-files '*MAINTAINERS' 'MAINTAINERS' 2>/dev/null) && [ -n "$list" ]; then
+ set -- $list
+else
+ # Fall back to a filesystem search if git is unavailable.
+ set -- $(find . -name MAINTAINERS -type f | sed 's,^\./,,')
fi
+unset IFS
+set +f
rc=0
-while IFS= read -r pattern; do
- # Strip the "F:" prefix and surrounding whitespace.
- pattern=$(printf '%s\n' "$pattern" | sed -e 's/^F:[[:space:]]*//' -e 's/[[:space:]]*$//')
- [ -n "$pattern" ] || continue
-
- # Expand the pattern as a glob; if nothing matches the glob stays literal.
- matched=0
- for path in $pattern; do
- if [ -e "$path" ]; then
- matched=1
- break
+for maint in "$@"; do
+ [ -f "$maint" ] || continue
+
+ # Skip Buildman's test fixtures, whose F: paths are relative to the
+ # test setup rather than the repository root.
+ case "$maint" in
+ tools/buildman/*) continue ;;
+ esac
+
+ while IFS= read -r pattern; do
+ # Strip the "F:" prefix and surrounding whitespace, then drop the
+ # backslashes MAINTAINERS uses to escape regex-special characters
+ # (e.g. "board/k\+p/") so the pattern can be used as a plain glob.
+ pattern=$(printf '%s\n' "$pattern" | sed -e 's/^F:[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/\\\(.\)/\1/g')
+ [ -n "$pattern" ] || continue
+
+ matched=0
+ for path in $pattern; do
+ if [ -e "$path" ]; then
+ matched=1
+ break
+ fi
+ done
+
+ if [ "$matched" -eq 0 ]; then
+ echo "error: $maint references non-existing file: $pattern" >&2
+ rc=1
fi
- done
-
- if [ "$matched" -eq 0 ]; then
- echo "error: MAINTAINERS references non-existing file: $pattern" >&2
- rc=1
- fi
-done <<EOF
-$(grep '^F:' "$MAINTAINERS")
+ done <<EOF
+$(grep '^F:' "$maint")
EOF
+done
if [ "$rc" -eq 0 ]; then
echo "All MAINTAINERS F: entries exist."
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 2/7] MAINTAINERS: tegra: Update and correct entries
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
2026-09-10 20:03 ` [PATCH v3 1/7] scripts: Check F: entries in all MAINTAINERS files Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-11 16:33 ` Svyatoslav Ryhel
2026-09-10 20:03 ` [PATCH v3 3/7] MAINTAINERS: rockchip: Use N for rk3576-nanopi-r76s Tom Rini
` (4 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek, Thierry Reding, Svyatoslav Ryhel
Update the main MAINTAINERS entry for Tegra to make use of the "N:"
syntax to catch everything with tegra in the filename. This lets us
remove the incorrect board config header entries for a large number of
platforms. Furthermore, correct some platform MAINTAINERS files that other
obvious issues (such as .dtb rather than .dts in listings).
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v3:
- Per Svyatoslav, drop adding include/configs/tegra.h to the board/
MAINTAINERS files.
Cc: Michal Simek <michal.simek@amd.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Svyatoslav Ryhel <clamor95@gmail.com>
This is slightly different than Michal's version because it adds the "N"
entry for Tegra overall and so catches include/configs/tegra.h which all
of the boards which had their include/configs/ line removed actually
use.
---
MAINTAINERS | 6 +-----
board/acer/picasso/MAINTAINERS | 1 -
board/asus/grouper/MAINTAINERS | 1 -
board/asus/transformer-t114/MAINTAINERS | 1 -
board/asus/transformer-t20/MAINTAINERS | 1 -
board/asus/transformer-t30/MAINTAINERS | 1 -
board/avionic-design/medcom-wide/MAINTAINERS | 1 -
board/avionic-design/plutux/MAINTAINERS | 1 -
board/avionic-design/tec-ng/MAINTAINERS | 1 -
board/avionic-design/tec/MAINTAINERS | 1 -
board/cei/cei-tk1-som/MAINTAINERS | 1 -
board/compal/paz00/MAINTAINERS | 1 -
board/compulab/trimslice/MAINTAINERS | 1 -
board/htc/endeavoru/MAINTAINERS | 1 -
board/lenovo/ideapad-yoga-11/MAINTAINERS | 1 -
board/lg/x3-t30/MAINTAINERS | 1 -
board/microsoft/surface-rt/MAINTAINERS | 1 -
board/nvidia/beaver/MAINTAINERS | 1 -
board/nvidia/cardhu/MAINTAINERS | 1 -
board/nvidia/dalmore/MAINTAINERS | 1 -
board/nvidia/harmony/MAINTAINERS | 1 -
board/nvidia/jetson-tk1/MAINTAINERS | 1 -
board/nvidia/nyan-big/MAINTAINERS | 1 -
board/nvidia/p2371-0000/MAINTAINERS | 1 -
board/nvidia/p2371-2180/MAINTAINERS | 1 -
board/nvidia/p2571/MAINTAINERS | 1 -
board/nvidia/p2771-0000/MAINTAINERS | 1 -
board/nvidia/p3450-0000/MAINTAINERS | 1 -
board/nvidia/seaboard/MAINTAINERS | 1 -
board/nvidia/tegratab/MAINTAINERS | 1 -
board/nvidia/venice2/MAINTAINERS | 1 -
board/nvidia/ventana/MAINTAINERS | 1 -
board/ouya/ouya/MAINTAINERS | 1 -
board/toradex/apalis-tk1/MAINTAINERS | 2 +-
board/toradex/apalis_t30/MAINTAINERS | 3 +--
board/toradex/colibri_t20/MAINTAINERS | 3 +--
board/toradex/colibri_t30/MAINTAINERS | 3 +--
board/wexler/qc750/MAINTAINERS | 1 -
board/xiaomi/mocha/MAINTAINERS | 1 -
39 files changed, 5 insertions(+), 46 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e9ccca5ca44..341c308e3efc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -671,11 +671,7 @@ M: Thierry Reding <treding@nvidia.com>
M: Svyatoslav Ryhel <clamor95@gmail.com>
S: Maintained
T: git https://git.u-boot-project.org/u-boot/custodians/u-boot-tegra.git
-F: arch/arm/dts/tegra*
-F: arch/arm/include/asm/arch-tegra*/
-F: arch/arm/mach-tegra/
-F: drivers/*/tegra*
-F: drivers/*/tegra*/
+N: tegra
ARM TI
M: Tom Rini <trini@konsulko.com>
diff --git a/board/acer/picasso/MAINTAINERS b/board/acer/picasso/MAINTAINERS
index 99f8c0b6d7fa..ab2fe5ebdf5e 100644
--- a/board/acer/picasso/MAINTAINERS
+++ b/board/acer/picasso/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/acer/picasso/
F: configs/picasso_defconfig
F: doc/board/acer/picasso.rst
-F: include/configs/picasso.h
diff --git a/board/asus/grouper/MAINTAINERS b/board/asus/grouper/MAINTAINERS
index 3c59632451ff..6a54389c74ec 100644
--- a/board/asus/grouper/MAINTAINERS
+++ b/board/asus/grouper/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/asus/grouper/
F: configs/grouper_defconfig
F: doc/board/asus/grouper.rst
-F: include/configs/grouper.h
diff --git a/board/asus/transformer-t114/MAINTAINERS b/board/asus/transformer-t114/MAINTAINERS
index 2e8f01b98df2..01692fd29af7 100644
--- a/board/asus/transformer-t114/MAINTAINERS
+++ b/board/asus/transformer-t114/MAINTAINERS
@@ -5,4 +5,3 @@ F: arch/arm/dts/tegra114-asus-tf701t.dts
F: board/asus/transformer-t114/
F: configs/tf701t_defconfig
F: doc/board/asus/transformer_t114.rst
-F: include/configs/transformer-t114.h
diff --git a/board/asus/transformer-t20/MAINTAINERS b/board/asus/transformer-t20/MAINTAINERS
index 7bf93570985f..28b8f954e7c6 100644
--- a/board/asus/transformer-t20/MAINTAINERS
+++ b/board/asus/transformer-t20/MAINTAINERS
@@ -5,4 +5,3 @@ F: arch/arm/dts/tegra20-asus-*
F: board/asus/transformer-t20/
F: configs/transformer_t20_defconfig
F: doc/board/asus/transformer_t20.rst
-F: include/configs/transformer-t20.h
diff --git a/board/asus/transformer-t30/MAINTAINERS b/board/asus/transformer-t30/MAINTAINERS
index 869cc5aeb910..3fdcdd7c027a 100644
--- a/board/asus/transformer-t30/MAINTAINERS
+++ b/board/asus/transformer-t30/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/asus/transformer-t30/
F: configs/transformer_t30_defconfig
F: doc/board/asus/transformer_t30.rst
-F: include/configs/transformer-t30.h
diff --git a/board/avionic-design/medcom-wide/MAINTAINERS b/board/avionic-design/medcom-wide/MAINTAINERS
index 3d2cdeca7259..c0f75035be9f 100644
--- a/board/avionic-design/medcom-wide/MAINTAINERS
+++ b/board/avionic-design/medcom-wide/MAINTAINERS
@@ -3,5 +3,4 @@ M: Alban Bedel <alban.bedel@avionic-design.de>
S: Maintained
F: board/avionic-design/medcom-wide/
F: board/avionic-design/common/
-F: include/configs/medcom-wide.h
F: configs/medcom-wide_defconfig
diff --git a/board/avionic-design/plutux/MAINTAINERS b/board/avionic-design/plutux/MAINTAINERS
index 0275680d21f2..0b76fd5348cf 100644
--- a/board/avionic-design/plutux/MAINTAINERS
+++ b/board/avionic-design/plutux/MAINTAINERS
@@ -3,5 +3,4 @@ M: Alban Bedel <alban.bedel@avionic-design.de>
S: Maintained
F: board/avionic-design/plutux/
F: board/avionic-design/common/
-F: include/configs/plutux.h
F: configs/plutux_defconfig
diff --git a/board/avionic-design/tec-ng/MAINTAINERS b/board/avionic-design/tec-ng/MAINTAINERS
index 645be8186aa6..36bd28b7cd90 100644
--- a/board/avionic-design/tec-ng/MAINTAINERS
+++ b/board/avionic-design/tec-ng/MAINTAINERS
@@ -3,5 +3,4 @@ M: Alban Bedel <alban.bedel@avionic-design.de>
S: Maintained
F: board/avionic-design/tec-ng/
F: board/avionic-design/common/
-F: include/configs/tec-ng.h
F: configs/tec-ng_defconfig
diff --git a/board/avionic-design/tec/MAINTAINERS b/board/avionic-design/tec/MAINTAINERS
index 36088e7daccf..b1fa0eff7755 100644
--- a/board/avionic-design/tec/MAINTAINERS
+++ b/board/avionic-design/tec/MAINTAINERS
@@ -3,5 +3,4 @@ M: Alban Bedel <alban.bedel@avionic-design.de>
S: Maintained
F: board/avionic-design/tec/
F: board/avionic-design/common/
-F: include/configs/tec.h
F: configs/tec_defconfig
diff --git a/board/cei/cei-tk1-som/MAINTAINERS b/board/cei/cei-tk1-som/MAINTAINERS
index f1817401a5df..20affd32d424 100644
--- a/board/cei/cei-tk1-som/MAINTAINERS
+++ b/board/cei/cei-tk1-som/MAINTAINERS
@@ -2,5 +2,4 @@ TK1-SOM BOARD
M: Peter.Chubb@data61.csiro.au
S: Maintained
F: board/cei/cei-tk1-som/
-F: include/configs/cei-tk1-som.h
F: configs/cei-tk1-som_defconfig
diff --git a/board/compal/paz00/MAINTAINERS b/board/compal/paz00/MAINTAINERS
index ba174cd190db..477ef604a82e 100644
--- a/board/compal/paz00/MAINTAINERS
+++ b/board/compal/paz00/MAINTAINERS
@@ -2,5 +2,4 @@ PAZ00 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/compal/paz00/
-F: include/configs/paz00.h
F: configs/paz00_defconfig
diff --git a/board/compulab/trimslice/MAINTAINERS b/board/compulab/trimslice/MAINTAINERS
index 4eb868c0c838..da557f8e1083 100644
--- a/board/compulab/trimslice/MAINTAINERS
+++ b/board/compulab/trimslice/MAINTAINERS
@@ -2,5 +2,4 @@ TRIMSLICE BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/compulab/trimslice/
-F: include/configs/trimslice.h
F: configs/trimslice_defconfig
diff --git a/board/htc/endeavoru/MAINTAINERS b/board/htc/endeavoru/MAINTAINERS
index 85f439f4672e..7ad66e37914a 100644
--- a/board/htc/endeavoru/MAINTAINERS
+++ b/board/htc/endeavoru/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/htc/endeavoru/
F: configs/endeavoru_defconfig
F: doc/board/htc/endeavoru.rst
-F: include/configs/endeavoru.h
diff --git a/board/lenovo/ideapad-yoga-11/MAINTAINERS b/board/lenovo/ideapad-yoga-11/MAINTAINERS
index 77e82534a95c..c65bf943c2a6 100644
--- a/board/lenovo/ideapad-yoga-11/MAINTAINERS
+++ b/board/lenovo/ideapad-yoga-11/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/lenovo/ideapad-yoga-11/
F: configs/ideapad-yoga-11_defconfig
F: doc/board/lenovo/ideapad-yoga-11.rst
-F: include/configs/ideapad-yoga-11.h
diff --git a/board/lg/x3-t30/MAINTAINERS b/board/lg/x3-t30/MAINTAINERS
index 13c8588d0b92..55cac0ba2833 100644
--- a/board/lg/x3-t30/MAINTAINERS
+++ b/board/lg/x3-t30/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/lg/x3-t30/
F: configs/x3_t30_defconfig
F: doc/board/lg/x3_t30.rst
-F: include/configs/x3-t30.h
diff --git a/board/microsoft/surface-rt/MAINTAINERS b/board/microsoft/surface-rt/MAINTAINERS
index 1bbd896de928..8c55978f6965 100644
--- a/board/microsoft/surface-rt/MAINTAINERS
+++ b/board/microsoft/surface-rt/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/microsoft/surface-rt/
F: configs/surface-rt_defconfig
F: doc/board/microsoft/surface-rt.rst
-F: include/configs/surface-rt.h
diff --git a/board/nvidia/beaver/MAINTAINERS b/board/nvidia/beaver/MAINTAINERS
index 20d5836b9ec8..1dd1fad7fbfa 100644
--- a/board/nvidia/beaver/MAINTAINERS
+++ b/board/nvidia/beaver/MAINTAINERS
@@ -2,5 +2,4 @@ BEAVER BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/beaver/
-F: include/configs/beaver.h
F: configs/beaver_defconfig
diff --git a/board/nvidia/cardhu/MAINTAINERS b/board/nvidia/cardhu/MAINTAINERS
index d3c3e368c17b..3984aa8d57b7 100644
--- a/board/nvidia/cardhu/MAINTAINERS
+++ b/board/nvidia/cardhu/MAINTAINERS
@@ -2,5 +2,4 @@ CARDHU BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/cardhu/
-F: include/configs/cardhu.h
F: configs/cardhu_defconfig
diff --git a/board/nvidia/dalmore/MAINTAINERS b/board/nvidia/dalmore/MAINTAINERS
index fe86375ca9b4..5c8c08a2bdaa 100644
--- a/board/nvidia/dalmore/MAINTAINERS
+++ b/board/nvidia/dalmore/MAINTAINERS
@@ -2,5 +2,4 @@ DALMORE BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/dalmore/
-F: include/configs/dalmore.h
F: configs/dalmore_defconfig
diff --git a/board/nvidia/harmony/MAINTAINERS b/board/nvidia/harmony/MAINTAINERS
index f3508edc3f56..2c25611dc358 100644
--- a/board/nvidia/harmony/MAINTAINERS
+++ b/board/nvidia/harmony/MAINTAINERS
@@ -2,5 +2,4 @@ HARMONY BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/harmony/
-F: include/configs/harmony.h
F: configs/harmony_defconfig
diff --git a/board/nvidia/jetson-tk1/MAINTAINERS b/board/nvidia/jetson-tk1/MAINTAINERS
index f0d8f5eb8e52..15a7a04de392 100644
--- a/board/nvidia/jetson-tk1/MAINTAINERS
+++ b/board/nvidia/jetson-tk1/MAINTAINERS
@@ -2,5 +2,4 @@ JETSON-TK1 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/jetson-tk1/
-F: include/configs/jetson-tk1.h
F: configs/jetson-tk1_defconfig
diff --git a/board/nvidia/nyan-big/MAINTAINERS b/board/nvidia/nyan-big/MAINTAINERS
index 779077729c92..91a48bda0a8f 100644
--- a/board/nvidia/nyan-big/MAINTAINERS
+++ b/board/nvidia/nyan-big/MAINTAINERS
@@ -2,5 +2,4 @@ NYAN-BIG BOARD
M: Allen Martin <amartin@nvidia.com>
S: Maintained
F: board/nvidia/nyan-big/
-F: include/configs/nyan-big.h
F: configs/nyan-big_defconfig
diff --git a/board/nvidia/p2371-0000/MAINTAINERS b/board/nvidia/p2371-0000/MAINTAINERS
index e6d04bf7c5e1..d3f6d64731d4 100644
--- a/board/nvidia/p2371-0000/MAINTAINERS
+++ b/board/nvidia/p2371-0000/MAINTAINERS
@@ -2,5 +2,4 @@ P2371-0000 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/p2371-0000/
-F: include/configs/p2371-0000.h
F: configs/p2371-0000_defconfig
diff --git a/board/nvidia/p2371-2180/MAINTAINERS b/board/nvidia/p2371-2180/MAINTAINERS
index 815377490c7f..49d6062ab6b7 100644
--- a/board/nvidia/p2371-2180/MAINTAINERS
+++ b/board/nvidia/p2371-2180/MAINTAINERS
@@ -2,5 +2,4 @@ P2371-2180 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/p2371-2180/
-F: include/configs/p2371-2180.h
F: configs/p2371-2180_defconfig
diff --git a/board/nvidia/p2571/MAINTAINERS b/board/nvidia/p2571/MAINTAINERS
index c165135a9432..23b9c6e83e3b 100644
--- a/board/nvidia/p2571/MAINTAINERS
+++ b/board/nvidia/p2571/MAINTAINERS
@@ -2,5 +2,4 @@ P2571 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/p2571/
-F: include/configs/p2571.h
F: configs/p2571_defconfig
diff --git a/board/nvidia/p2771-0000/MAINTAINERS b/board/nvidia/p2771-0000/MAINTAINERS
index 1a49e63231de..7dbdbe0bcea2 100644
--- a/board/nvidia/p2771-0000/MAINTAINERS
+++ b/board/nvidia/p2771-0000/MAINTAINERS
@@ -2,6 +2,5 @@ P2771-0000 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/p2771-0000/
-F: include/configs/p2771-0000.h
F: configs/p2771-0000-000_defconfig
F: configs/p2771-0000-500_defconfig
diff --git a/board/nvidia/p3450-0000/MAINTAINERS b/board/nvidia/p3450-0000/MAINTAINERS
index 40700066bf39..6b93e40c842d 100644
--- a/board/nvidia/p3450-0000/MAINTAINERS
+++ b/board/nvidia/p3450-0000/MAINTAINERS
@@ -2,5 +2,4 @@ P3450-0000 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/p3450-0000/
-F: include/configs/p3450-0000.h
F: configs/p3450-0000_defconfig
diff --git a/board/nvidia/seaboard/MAINTAINERS b/board/nvidia/seaboard/MAINTAINERS
index 7926ca19a896..b4759028a778 100644
--- a/board/nvidia/seaboard/MAINTAINERS
+++ b/board/nvidia/seaboard/MAINTAINERS
@@ -2,5 +2,4 @@ SEABOARD BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/seaboard/
-F: include/configs/seaboard.h
F: configs/seaboard_defconfig
diff --git a/board/nvidia/tegratab/MAINTAINERS b/board/nvidia/tegratab/MAINTAINERS
index bfd9eae86581..903279523a3d 100644
--- a/board/nvidia/tegratab/MAINTAINERS
+++ b/board/nvidia/tegratab/MAINTAINERS
@@ -5,4 +5,3 @@ F: arch/arm/dts/tegra114-nvidia-tegratab.dts
F: board/nvidia/tegratab/
F: configs/tegratab_defconfig
F: doc/board/nvidia/tegratab.rst
-F: include/configs/tegratab.h
diff --git a/board/nvidia/venice2/MAINTAINERS b/board/nvidia/venice2/MAINTAINERS
index 221df654d741..3ce3c6e1d26e 100644
--- a/board/nvidia/venice2/MAINTAINERS
+++ b/board/nvidia/venice2/MAINTAINERS
@@ -2,5 +2,4 @@ VENICE2 BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/venice2/
-F: include/configs/venice2.h
F: configs/venice2_defconfig
diff --git a/board/nvidia/ventana/MAINTAINERS b/board/nvidia/ventana/MAINTAINERS
index ba65a2bfc2fb..a83fec521335 100644
--- a/board/nvidia/ventana/MAINTAINERS
+++ b/board/nvidia/ventana/MAINTAINERS
@@ -2,5 +2,4 @@ VENTANA BOARD
M: Tom Warren <twarren@nvidia.com>
S: Maintained
F: board/nvidia/ventana/
-F: include/configs/ventana.h
F: configs/ventana_defconfig
diff --git a/board/ouya/ouya/MAINTAINERS b/board/ouya/ouya/MAINTAINERS
index 7f664b2e65ff..6cac853823dc 100644
--- a/board/ouya/ouya/MAINTAINERS
+++ b/board/ouya/ouya/MAINTAINERS
@@ -5,4 +5,3 @@ S: Maintained
F: board/ouya/ouya/
F: configs/ouya_defconfig
F: doc/board/ouya/ouya.rst
-F: include/configs/ouya.h
diff --git a/board/toradex/apalis-tk1/MAINTAINERS b/board/toradex/apalis-tk1/MAINTAINERS
index 393c8dcf8016..6ac3df370e7a 100644
--- a/board/toradex/apalis-tk1/MAINTAINERS
+++ b/board/toradex/apalis-tk1/MAINTAINERS
@@ -5,4 +5,4 @@ F: board/toradex/apalis-tk1/
F: board/toradex/common/
F: include/configs/apalis-tk1.h
F: configs/apalis-tk1_defconfig
-F: arch/arm/dts/tegra124-apalis.dtb
+F: arch/arm/dts/tegra124-apalis.dts
diff --git a/board/toradex/apalis_t30/MAINTAINERS b/board/toradex/apalis_t30/MAINTAINERS
index 368decf66744..a5db24f0036b 100644
--- a/board/toradex/apalis_t30/MAINTAINERS
+++ b/board/toradex/apalis_t30/MAINTAINERS
@@ -3,6 +3,5 @@ M: Francesco Dolcini <francesco.dolcini@toradex.com>
S: Maintained
F: board/toradex/apalis_t30/
F: board/toradex/common/
-F: include/configs/apalis_t30.h
F: configs/apalis_t30_defconfig
-F: arch/arm/dts/tegra30-apalis.dtb
+F: arch/arm/dts/tegra30-apalis.dts
diff --git a/board/toradex/colibri_t20/MAINTAINERS b/board/toradex/colibri_t20/MAINTAINERS
index 58842434024f..1a86230a0c1e 100644
--- a/board/toradex/colibri_t20/MAINTAINERS
+++ b/board/toradex/colibri_t20/MAINTAINERS
@@ -3,6 +3,5 @@ M: Francesco Dolcini <francesco.dolcini@toradex.com>
S: Maintained
F: board/toradex/colibri_t20/
F: board/toradex/common/
-F: include/configs/colibri_t20.h
F: configs/colibri_t20_defconfig
-F: arch/arm/dts/tegra20-colibri.dtb
+F: arch/arm/dts/tegra20-colibri.dts
diff --git a/board/toradex/colibri_t30/MAINTAINERS b/board/toradex/colibri_t30/MAINTAINERS
index 73859fd25c2e..026ea0a3b3a1 100644
--- a/board/toradex/colibri_t30/MAINTAINERS
+++ b/board/toradex/colibri_t30/MAINTAINERS
@@ -3,6 +3,5 @@ M: Francesco Dolcini <francesco.dolcini@toradex.com>
S: Maintained
F: board/toradex/colibri_t30/
F: board/toradex/common/
-F: include/configs/colibri_t30.h
F: configs/colibri_t30_defconfig
-F: arch/arm/dts/tegra30-colibri.dtb
+F: arch/arm/dts/tegra30-colibri.dts
diff --git a/board/wexler/qc750/MAINTAINERS b/board/wexler/qc750/MAINTAINERS
index 017f6f2b707e..7922514c5d75 100644
--- a/board/wexler/qc750/MAINTAINERS
+++ b/board/wexler/qc750/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/wexler/qc750/
F: configs/qc750_defconfig
F: doc/board/wexler/qc750.rst
-F: include/configs/qc750.h
diff --git a/board/xiaomi/mocha/MAINTAINERS b/board/xiaomi/mocha/MAINTAINERS
index c3871a15a35b..90215d1325a4 100644
--- a/board/xiaomi/mocha/MAINTAINERS
+++ b/board/xiaomi/mocha/MAINTAINERS
@@ -5,4 +5,3 @@ F: arch/arm/dts/tegra124-xiaomi-mocha.dts
F: board/xiaomi/mocha/
F: configs/mocha_defconfig
F: doc/board/xiaomi/mocha.rst
-F: include/configs/mocha.h
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/7] MAINTAINERS: tegra: Update and correct entries
2026-09-10 20:03 ` [PATCH v3 2/7] MAINTAINERS: tegra: Update and correct entries Tom Rini
@ 2026-09-11 16:33 ` Svyatoslav Ryhel
0 siblings, 0 replies; 9+ messages in thread
From: Svyatoslav Ryhel @ 2026-09-11 16:33 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Michal Simek, Thierry Reding
чт, 10 вер. 2026 р. о 23:03 Tom Rini <trini@konsulko.com> пише:
>
> Update the main MAINTAINERS entry for Tegra to make use of the "N:"
> syntax to catch everything with tegra in the filename. This lets us
> remove the incorrect board config header entries for a large number of
> platforms. Furthermore, correct some platform MAINTAINERS files that other
> obvious issues (such as .dtb rather than .dts in listings).
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v3:
> - Per Svyatoslav, drop adding include/configs/tegra.h to the board/
> MAINTAINERS files.
>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Thierry Reding <treding@nvidia.com>
> Cc: Svyatoslav Ryhel <clamor95@gmail.com>
>
> This is slightly different than Michal's version because it adds the "N"
> entry for Tegra overall and so catches include/configs/tegra.h which all
> of the boards which had their include/configs/ line removed actually
> use.
> ---
> MAINTAINERS | 6 +-----
> board/acer/picasso/MAINTAINERS | 1 -
> board/asus/grouper/MAINTAINERS | 1 -
> board/asus/transformer-t114/MAINTAINERS | 1 -
> board/asus/transformer-t20/MAINTAINERS | 1 -
> board/asus/transformer-t30/MAINTAINERS | 1 -
> board/avionic-design/medcom-wide/MAINTAINERS | 1 -
> board/avionic-design/plutux/MAINTAINERS | 1 -
> board/avionic-design/tec-ng/MAINTAINERS | 1 -
> board/avionic-design/tec/MAINTAINERS | 1 -
> board/cei/cei-tk1-som/MAINTAINERS | 1 -
> board/compal/paz00/MAINTAINERS | 1 -
> board/compulab/trimslice/MAINTAINERS | 1 -
> board/htc/endeavoru/MAINTAINERS | 1 -
> board/lenovo/ideapad-yoga-11/MAINTAINERS | 1 -
> board/lg/x3-t30/MAINTAINERS | 1 -
> board/microsoft/surface-rt/MAINTAINERS | 1 -
> board/nvidia/beaver/MAINTAINERS | 1 -
> board/nvidia/cardhu/MAINTAINERS | 1 -
> board/nvidia/dalmore/MAINTAINERS | 1 -
> board/nvidia/harmony/MAINTAINERS | 1 -
> board/nvidia/jetson-tk1/MAINTAINERS | 1 -
> board/nvidia/nyan-big/MAINTAINERS | 1 -
> board/nvidia/p2371-0000/MAINTAINERS | 1 -
> board/nvidia/p2371-2180/MAINTAINERS | 1 -
> board/nvidia/p2571/MAINTAINERS | 1 -
> board/nvidia/p2771-0000/MAINTAINERS | 1 -
> board/nvidia/p3450-0000/MAINTAINERS | 1 -
> board/nvidia/seaboard/MAINTAINERS | 1 -
> board/nvidia/tegratab/MAINTAINERS | 1 -
> board/nvidia/venice2/MAINTAINERS | 1 -
> board/nvidia/ventana/MAINTAINERS | 1 -
> board/ouya/ouya/MAINTAINERS | 1 -
> board/toradex/apalis-tk1/MAINTAINERS | 2 +-
> board/toradex/apalis_t30/MAINTAINERS | 3 +--
> board/toradex/colibri_t20/MAINTAINERS | 3 +--
> board/toradex/colibri_t30/MAINTAINERS | 3 +--
> board/wexler/qc750/MAINTAINERS | 1 -
> board/xiaomi/mocha/MAINTAINERS | 1 -
> 39 files changed, 5 insertions(+), 46 deletions(-)
>
Thank you!
Reviewed-by: Svyatoslav Ryhel <clamor95@gmail.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 3/7] MAINTAINERS: rockchip: Use N for rk3576-nanopi-r76s
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
2026-09-10 20:03 ` [PATCH v3 1/7] scripts: Check F: entries in all MAINTAINERS files Tom Rini
2026-09-10 20:03 ` [PATCH v3 2/7] MAINTAINERS: tegra: Update and correct entries Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-10 20:03 ` [PATCH v3 4/7] MAINTAINERS: Fix "typo" and similar incorrect entries Tom Rini
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek, Jonas Karlman
As part of the initial discussion about ensuring MAINTAINERS files don't
reference files that don't exist, one issue is ensuring that newly
introduced files get the right maintainer. In this case, add an 'N'
entry for rk3576-nanopi-r76s so the maintainer would see any new files.
Signed-off-by: Tom Rini <trini@konsulko.com>
--
Cc: Michal Simek <michal.simek@amd.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
---
arch/arm/mach-rockchip/rk3576/MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/rk3576/MAINTAINERS b/arch/arm/mach-rockchip/rk3576/MAINTAINERS
index 79cf9e97f70b..baae63fc7b08 100644
--- a/arch/arm/mach-rockchip/rk3576/MAINTAINERS
+++ b/arch/arm/mach-rockchip/rk3576/MAINTAINERS
@@ -13,7 +13,7 @@ F: configs/nanopi-m5-rk3576_defconfig
NANOPI-R76S-RK3576
M: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
-F: arch/arm/dts/rk3576-nanopi-r76s*
+N: rk3576-nanopi-r76s
F: configs/nanopi-r76s-rk3576_defconfig
OMNI3576-RK3576
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 4/7] MAINTAINERS: Fix "typo" and similar incorrect entries
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
` (2 preceding siblings ...)
2026-09-10 20:03 ` [PATCH v3 3/7] MAINTAINERS: rockchip: Use N for rk3576-nanopi-r76s Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-10 20:03 ` [PATCH v3 5/7] MAINTAINERS: Correct entries missed during renames Tom Rini
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
This goes and fixes MAINTAINERS file entries that reference files that
don't exist in mainline due things like:
- A typo / missing extension / similar
- Not updating the entry when the location was changed as part of review
feedback
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v3:
- Drop boards/ti/ changes in favor of Bryan's series.
Cc: Michal Simek <michal.simek@amd.com>
---
board/CZ.NIC/turris_omnia/MAINTAINERS | 2 +-
board/Marvell/octeontx/MAINTAINERS | 3 +--
board/Marvell/octeontx2/MAINTAINERS | 3 +--
board/advantech/imx8mp_rsb3720a1/MAINTAINERS | 2 +-
board/advantech/imx8qm_dmsse20_a1/MAINTAINERS | 2 +-
board/alliedtelesis/SBx81LIFKW/MAINTAINERS | 2 +-
board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS | 2 +-
board/amd/versal2/MAINTAINERS | 2 +-
board/andestech/voyager/MAINTAINERS | 2 +-
board/atmel/sama5d29_curiosity/MAINTAINERS | 2 +-
board/atmel/sama7d65_curiosity/MAINTAINERS | 2 +-
board/atmel/sama7g54_curiosity/MAINTAINERS | 2 +-
board/atmel/sama7g5ek/MAINTAINERS | 2 +-
board/bosch/acc/MAINTAINERS | 2 +-
board/comtrend/vr3032u/MAINTAINERS | 2 +-
board/comtrend/wap5813n/MAINTAINERS | 2 +-
board/coolpi/genbook_cm5_rk3588/MAINTAINERS | 2 +-
board/davinci/da8xxevm/MAINTAINERS | 2 +-
board/friendlyarm/nanopi2/MAINTAINERS | 2 +-
board/gardena/smart-gateway-at91sam/MAINTAINERS | 2 +-
board/imgtec/xilfpga/MAINTAINERS | 2 +-
board/intel/agilex7m-socdk/MAINTAINERS | 2 +-
board/libre-computer/aml-a311d-cc/MAINTAINERS | 2 +-
board/libre-computer/aml-s805x-ac/MAINTAINERS | 2 +-
board/libre-computer/aml-s905d3-cc/MAINTAINERS | 2 +-
board/myir/mys_6ulx/MAINTAINERS | 3 ++-
board/phytec/phycore_am62ax/MAINTAINERS | 2 +-
board/phytec/phycore_imx8mm/MAINTAINERS | 2 +-
board/siemens/iot2050/MAINTAINERS | 2 +-
board/sifive/unmatched/MAINTAINERS | 2 +-
board/toradex/colibri-imx8x/MAINTAINERS | 4 ++--
board/toradex/colibri_imx7/MAINTAINERS | 12 ++++++------
board/toradex/colibri_vf/MAINTAINERS | 2 +-
board/toradex/smarc-imx8mp/MAINTAINERS | 2 +-
board/xilinx/zynqmp_r5/MAINTAINERS | 2 +-
board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS | 2 +-
36 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS
index effce8a753b4..33ddf51ce42d 100644
--- a/board/CZ.NIC/turris_omnia/MAINTAINERS
+++ b/board/CZ.NIC/turris_omnia/MAINTAINERS
@@ -5,5 +5,5 @@ F: arch/arm/dts/armada-385-turris-omnia*.dts*
F: board/CZ.NIC/turris_atsha_otp.*
F: board/CZ.NIC/turris_omnia/
F: configs/turris_omnia_defconfig
-F: drivers/gpio/turris_omnia_mcu.c
+F: drivers/misc/turris_omnia_mcu.c
F: include/configs/turris_omnia.h
diff --git a/board/Marvell/octeontx/MAINTAINERS b/board/Marvell/octeontx/MAINTAINERS
index 1f3b12b1abf2..fd6cabcfad7b 100644
--- a/board/Marvell/octeontx/MAINTAINERS
+++ b/board/Marvell/octeontx/MAINTAINERS
@@ -2,7 +2,6 @@ OCTEONTX BOARD
M: Aaron Williams <awilliams@marvell.com>
S: Maintained
F: board/Marvell/octeontx/
-F: include/configs/octeontx_81xx.h
-F: include/configs/octeontx_83xx.h
+F: include/configs/octeontx_common.h
F: configs/octeontx_81xx_defconfig
F: configs/octeontx_83xx_defconfig
diff --git a/board/Marvell/octeontx2/MAINTAINERS b/board/Marvell/octeontx2/MAINTAINERS
index eec1d77dd108..0941a5269b2c 100644
--- a/board/Marvell/octeontx2/MAINTAINERS
+++ b/board/Marvell/octeontx2/MAINTAINERS
@@ -2,7 +2,6 @@ OCTEONTX2 BOARD
M: Aaron Williams <awilliams@marvell.com>
S: Maintained
F: board/Marvell/octeontx2/
-F: include/configs/octeontx2_96xx.h
-F: include/configs/octeontx2_95xx.h
+F: include/configs/octeontx2_common.h
F: configs/octeontx2_96xx_defconfig
F: configs/octeontx2_95xx_defconfig
diff --git a/board/advantech/imx8mp_rsb3720a1/MAINTAINERS b/board/advantech/imx8mp_rsb3720a1/MAINTAINERS
index bc967af4f509..02ee85fd7b1b 100644
--- a/board/advantech/imx8mp_rsb3720a1/MAINTAINERS
+++ b/board/advantech/imx8mp_rsb3720a1/MAINTAINERS
@@ -2,6 +2,6 @@ i.MX8MP RSB3720 BOARD
M: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
S: Maintained
F: board/advantech/imx8mp_rsb3720a1/
-F: include/configs/imx8mp_rsb3720a1.h
+F: include/configs/imx8mp_rsb3720.h
F: configs/imx8mp_rsb3720a1_4G_defconfig
F: configs/imx8mp_rsb3720a1_6G_defconfig
diff --git a/board/advantech/imx8qm_dmsse20_a1/MAINTAINERS b/board/advantech/imx8qm_dmsse20_a1/MAINTAINERS
index 8292c6ba7122..8b933ad336b5 100644
--- a/board/advantech/imx8qm_dmsse20_a1/MAINTAINERS
+++ b/board/advantech/imx8qm_dmsse20_a1/MAINTAINERS
@@ -2,6 +2,6 @@ i.MX8QM ROM DMSSE20 a1 BOARD
M: Oliver Graute <oliver.graute@kococonnector.com>
S: Maintained
F: board/advantech/imx8qm_dmsse20_a1/
-F: arch/arm/dts/imx8qm-dmsse20-a1.dtb
+F: arch/arm/dts/imx8qm-dmsse20-a1.dts
F: include/configs/imx8qm_dmsse20.h
F: configs/imx8qm_dmsse20a1_defconfig
diff --git a/board/alliedtelesis/SBx81LIFKW/MAINTAINERS b/board/alliedtelesis/SBx81LIFKW/MAINTAINERS
index 31ccec0e9b7e..79e23f6724c8 100644
--- a/board/alliedtelesis/SBx81LIFKW/MAINTAINERS
+++ b/board/alliedtelesis/SBx81LIFKW/MAINTAINERS
@@ -2,6 +2,6 @@ SBx81LIFKW BOARD
M: Chris Packham <chris.packham@alliedtelesis.co.nz>
S: Maintained
F: board/alliedtelesis/SBx81LIFKW/
-F: include/configs/SBx81LIFKW
+F: include/configs/SBx81LIFKW.h
F: configs/SBx81LIFKW_defconfig
F: arch/arm/dts/kirkwood-atl-sbx81lifkw.dts
diff --git a/board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS b/board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS
index 6b722ded250e..25b94774de25 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS
+++ b/board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS
@@ -2,6 +2,6 @@ SBx81LIFXCAT BOARD
M: Chris Packham <chris.packham@alliedtelesis.co.nz>
S: Maintained
F: board/alliedtelesis/SBx81LIFXCAT/
-F: include/configs/SBx81LIFXCAT
+F: include/configs/SBx81LIFXCAT.h
F: configs/SBx81LIFXCAT_defconfig
F: arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts
diff --git a/board/amd/versal2/MAINTAINERS b/board/amd/versal2/MAINTAINERS
index 282eaddd7532..3c35f9c30100 100644
--- a/board/amd/versal2/MAINTAINERS
+++ b/board/amd/versal2/MAINTAINERS
@@ -2,6 +2,6 @@ XILINX_VERSAL2 BOARDS
M: Michal Simek <michal.simek@amd.com>
S: Maintained
T: git https://git.u-boot-project.org/u-boot/custodians/u-boot-amd.git
-F: arch/arm/dts/versal2*
+F: arch/arm/dts/amd-versal2*
F: board/amd/
F: configs/amd*
diff --git a/board/andestech/voyager/MAINTAINERS b/board/andestech/voyager/MAINTAINERS
index b87026ee383b..c0eee0f9eb4e 100644
--- a/board/andestech/voyager/MAINTAINERS
+++ b/board/andestech/voyager/MAINTAINERS
@@ -4,5 +4,5 @@ S: Maintained
F: board/andestech/voyager/
F: configs/voyager_spl_defconfig
F: doc/board/andestech/voyager.rst
-F: include/configs/qilai.h
+F: include/configs/voyager.h
diff --git a/board/atmel/sama5d29_curiosity/MAINTAINERS b/board/atmel/sama5d29_curiosity/MAINTAINERS
index 54894d6cbb68..58f918c00c41 100644
--- a/board/atmel/sama5d29_curiosity/MAINTAINERS
+++ b/board/atmel/sama5d29_curiosity/MAINTAINERS
@@ -1,7 +1,7 @@
SAMA5D29 CURIOSITY BOARD
M: Mihai Sain <mihai.sain@microchip.com>
S: Maintained
-F: board/atmel/sama5d29_curiosity.c
+F: board/atmel/sama5d29_curiosity/
F: include/configs/sama5d29_curiosity.h
F: configs/sama5d29_curiosity_mmc_defconfig
F: configs/sama5d29_curiosity_mmc1_defconfig
diff --git a/board/atmel/sama7d65_curiosity/MAINTAINERS b/board/atmel/sama7d65_curiosity/MAINTAINERS
index 054af3c65416..0720ae3c6a03 100644
--- a/board/atmel/sama7d65_curiosity/MAINTAINERS
+++ b/board/atmel/sama7d65_curiosity/MAINTAINERS
@@ -1,6 +1,6 @@
SAMA7D65 CURIOSITY BOARD
M: Ryan Wanner <ryan.wanner@microchip.com>
S: Maintained
-F: board/atmel/sama7d65_curiosity.c
+F: board/atmel/sama7d65_curiosity/
F: include/configs/sama7d65_curiosity.h
F: configs/sama7d65_curiosity_mmc1_defconfig
diff --git a/board/atmel/sama7g54_curiosity/MAINTAINERS b/board/atmel/sama7g54_curiosity/MAINTAINERS
index b9f1a271c09c..3eb2657ca1c8 100644
--- a/board/atmel/sama7g54_curiosity/MAINTAINERS
+++ b/board/atmel/sama7g54_curiosity/MAINTAINERS
@@ -1,7 +1,7 @@
SAMA7G54 CURIOSITY BOARD
M: Mihai Sain <mihai.sain@microchip.com>
S: Maintained
-F: board/atmel/sama7g54_curiosity.c
+F: board/atmel/sama7g54_curiosity/
F: include/configs/sama7g54_curiosity.h
F: configs/sama7g54_curiosity_mmc_defconfig
F: configs/sama7g54_curiosity_nandflash_defconfig
diff --git a/board/atmel/sama7g5ek/MAINTAINERS b/board/atmel/sama7g5ek/MAINTAINERS
index 4d1c6f666c0b..e2dca59f231d 100644
--- a/board/atmel/sama7g5ek/MAINTAINERS
+++ b/board/atmel/sama7g5ek/MAINTAINERS
@@ -1,7 +1,7 @@
SAMA7G5 EK BOARD
M: Eugen Hristev <ehristev@kernel.org>
S: Maintained
-F: board/atmel/sama7g5ek.c
+F: board/atmel/sama7g5ek/
F: include/configs/sama7g5ek.h
F: configs/sama7g5ek_mmc1_defconfig
F: configs/sama7g5ek_mmc_defconfig
diff --git a/board/bosch/acc/MAINTAINERS b/board/bosch/acc/MAINTAINERS
index 1b880037121f..473fc0855dd0 100644
--- a/board/bosch/acc/MAINTAINERS
+++ b/board/bosch/acc/MAINTAINERS
@@ -6,4 +6,4 @@ F: board/bosch/acc
F: include/configs/imx6q-bosch-acc.h
F: configs/imx6q_bosch_acc_defconfig
F: arch/arm/dts/imx6q-bosch-acc.dts
-F: arch/arm/dts/imx6q-bosch-acc-u-boot.dts
+F: arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi
diff --git a/board/comtrend/vr3032u/MAINTAINERS b/board/comtrend/vr3032u/MAINTAINERS
index 132101f4cd0c..54c4aa229cec 100644
--- a/board/comtrend/vr3032u/MAINTAINERS
+++ b/board/comtrend/vr3032u/MAINTAINERS
@@ -2,5 +2,5 @@ COMTREND VR-3032U BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
S: Maintained
F: board/comtrend/vr3032u/
-F: include/configs/comtrend_vr-3032u.h
+F: include/configs/comtrend_vr3032u.h
F: configs/comtrend_vr3032u_ram_defconfig
diff --git a/board/comtrend/wap5813n/MAINTAINERS b/board/comtrend/wap5813n/MAINTAINERS
index c6764831b2bc..8c8e0769f51f 100644
--- a/board/comtrend/wap5813n/MAINTAINERS
+++ b/board/comtrend/wap5813n/MAINTAINERS
@@ -2,5 +2,5 @@ COMTREND WAP-5813N BOARD
M: Álvaro Fernández Rojas <noltari@gmail.com>
S: Maintained
F: board/comtrend/wap5813n/
-F: include/configs/comtrend_wap-5813n.h
+F: include/configs/comtrend_wap5813n.h
F: configs/comtrend_wap5813n_ram_defconfig
diff --git a/board/coolpi/genbook_cm5_rk3588/MAINTAINERS b/board/coolpi/genbook_cm5_rk3588/MAINTAINERS
index 0496cc93b599..15c2354e8225 100644
--- a/board/coolpi/genbook_cm5_rk3588/MAINTAINERS
+++ b/board/coolpi/genbook_cm5_rk3588/MAINTAINERS
@@ -1,7 +1,7 @@
GENBOOK-CM5-RK3588
M: Andy Yan <andyshrk@163.com>
S: Maintained
-F: board/coolpi/genbook-cm5-rk3588
+F: board/coolpi/genbook_cm5_rk3588
F: include/configs/genbook-cm5-rk3588.h
F: configs/coolpi-cm5-genbook-rk3588_defconfig
F: arch/arm/dts/rk3588-coolpi-cm5-genbook-u-boot.dtsi
diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS
index 993b22f2f638..c12b864b84b5 100644
--- a/board/davinci/da8xxevm/MAINTAINERS
+++ b/board/davinci/da8xxevm/MAINTAINERS
@@ -10,5 +10,5 @@ F: configs/da850evm_direct_nor_defconfig
OMAPL138_LCDK BOARD
M: Tom Rini <trini@konsulko.com>
S: Maintained
-F: include/configs/omap1l38_lcdk.h
+F: include/configs/omapl138_lcdk.h
F: configs/omapl138_lcdk_defconfig
diff --git a/board/friendlyarm/nanopi2/MAINTAINERS b/board/friendlyarm/nanopi2/MAINTAINERS
index c8e2ce7b7c0e..781f00dce6d5 100644
--- a/board/friendlyarm/nanopi2/MAINTAINERS
+++ b/board/friendlyarm/nanopi2/MAINTAINERS
@@ -2,6 +2,6 @@ NANOPI2 BOARD
NANOPC-T2 BOARD
M: Stefan Bosch <stefan_b@posteo.net>
S: Maintained
-F: board/s5p4418/nanopi2/
+F: board/friendlyarm/nanopi2/
F: include/configs/s5p4418_nanopi2.h
F: configs/s5p4418_nanopi2_defconfig
diff --git a/board/gardena/smart-gateway-at91sam/MAINTAINERS b/board/gardena/smart-gateway-at91sam/MAINTAINERS
index a5e4c71b824d..b115999fda61 100644
--- a/board/gardena/smart-gateway-at91sam/MAINTAINERS
+++ b/board/gardena/smart-gateway-at91sam/MAINTAINERS
@@ -4,4 +4,4 @@ S: Maintained
F: board/gardena/smart-gateway-at91sam/
F: include/configs/gardena-smart-gateway-at91sam.h
F: configs/gardena-smart-gateway-at91sam_defconfig
-F: arch/arm/dts/gardena-smart-gateway-at91sam.dts
+F: arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts
diff --git a/board/imgtec/xilfpga/MAINTAINERS b/board/imgtec/xilfpga/MAINTAINERS
index aa045325eac6..93a67e3af34b 100644
--- a/board/imgtec/xilfpga/MAINTAINERS
+++ b/board/imgtec/xilfpga/MAINTAINERS
@@ -2,5 +2,5 @@ XILFPGA BOARD
M: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
S: Maintained
F: board/imgtec/xilfpga
-F: include/configs/xilfpga.h
+F: include/configs/imgtec_xilfpga.h
F: configs/imgtec_xilfpga_defconfig
diff --git a/board/intel/agilex7m-socdk/MAINTAINERS b/board/intel/agilex7m-socdk/MAINTAINERS
index 9a5b80ae4dfe..eea2810d3287 100644
--- a/board/intel/agilex7m-socdk/MAINTAINERS
+++ b/board/intel/agilex7m-socdk/MAINTAINERS
@@ -7,4 +7,4 @@ F: arch/arm/dts/socfpga_agilex7m*
F: arch/arm/mach-socfpga/spl_agilex7m.c
F: board/intel/agilex7m-socdk/
F: include/configs/socfpga_agilex7m_socdk.h
-F: configs/socfpga_agilex7m_sdmmc_defconfig
+F: configs/socfpga_agilex7m_defconfig
diff --git a/board/libre-computer/aml-a311d-cc/MAINTAINERS b/board/libre-computer/aml-a311d-cc/MAINTAINERS
index b4b77acd23b2..a5c4bcdb998c 100644
--- a/board/libre-computer/aml-a311d-cc/MAINTAINERS
+++ b/board/libre-computer/aml-a311d-cc/MAINTAINERS
@@ -2,6 +2,6 @@ LIBRE-COMPUTER AML-A311D-CC
M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
-F: board/amlogic/aml-a311d-cc/
+F: board/libre-computer/aml-a311d-cc/
F: configs/aml-a311d-cc_defconfig
F: doc/board/amlogic/aml-a311d-cc.rst
diff --git a/board/libre-computer/aml-s805x-ac/MAINTAINERS b/board/libre-computer/aml-s805x-ac/MAINTAINERS
index 7cbc08aeb6c8..e434e5ed2289 100644
--- a/board/libre-computer/aml-s805x-ac/MAINTAINERS
+++ b/board/libre-computer/aml-s805x-ac/MAINTAINERS
@@ -2,7 +2,7 @@ LIBRE-COMPUTER AML-S805X-AC
M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
-F: board/amlogic/aml-s805x-ac/
+F: board/libre-computer/aml-s805x-ac/
F: include/configs/libretech-ac.h
F: configs/libretech-ac_defconfig
F: doc/board/amlogic/libretech-ac.rst
diff --git a/board/libre-computer/aml-s905d3-cc/MAINTAINERS b/board/libre-computer/aml-s905d3-cc/MAINTAINERS
index 4b75c815c07c..274518d13a3b 100644
--- a/board/libre-computer/aml-s905d3-cc/MAINTAINERS
+++ b/board/libre-computer/aml-s905d3-cc/MAINTAINERS
@@ -2,6 +2,6 @@ LIBRE-COMPUTER AML-S905D3-CC
M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
-F: board/amlogic/aml-s905d3-cc/
+F: board/libre-computer/aml-s905d3-cc/
F: configs/aml-s905d3-cc_defconfig
F: doc/board/amlogic/aml-s905d3-cc.rst
diff --git a/board/myir/mys_6ulx/MAINTAINERS b/board/myir/mys_6ulx/MAINTAINERS
index d4ee66118269..7f7850a566e7 100644
--- a/board/myir/mys_6ulx/MAINTAINERS
+++ b/board/myir/mys_6ulx/MAINTAINERS
@@ -1,8 +1,9 @@
MYS_6ULX BOARD
M: Parthiban Nallathambi <parthiban@linumiz.com>
S: Maintained
-F: arch/arm/dts/imx6ull-myir-mys-6ulx-nand.dts
F: arch/arm/dts/imx6ull-myir-mys-6ulx.dtsi
+F: arch/arm/dts/imx6ull-myir-mys-6ulx-eval.dts
+F: arch/arm/dts/imx6ull-myir-mys-6ulx-eval-u-boot.dts
F: arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi
F: board/myir/mys_6ulx/
F: configs/myir_mys_6ulx_defconfig
diff --git a/board/phytec/phycore_am62ax/MAINTAINERS b/board/phytec/phycore_am62ax/MAINTAINERS
index ded4a88d1997..1e3d90a01a22 100644
--- a/board/phytec/phycore_am62ax/MAINTAINERS
+++ b/board/phytec/phycore_am62ax/MAINTAINERS
@@ -5,7 +5,7 @@ L: upstream@lists.phytec.de
W: https://www.phytec.com/product/phycore-am62a
S: Maintained
F: arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
-F: arch/arm/dts/k3-am62a-phycore-som-ddr4-2gb.dtsit.dtsi
+F: arch/arm/dts/k3-am62a-phycore-som-ddr4-2gb.dtsi
F: arch/arm/dts/k3-am62a7-phyboard-lyra-rdk-u-boot.dtsi
F: arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
F: board/phytec/phycore_am62ax/
diff --git a/board/phytec/phycore_imx8mm/MAINTAINERS b/board/phytec/phycore_imx8mm/MAINTAINERS
index 5cada15ac4b3..e60bb94b91fb 100644
--- a/board/phytec/phycore_imx8mm/MAINTAINERS
+++ b/board/phytec/phycore_imx8mm/MAINTAINERS
@@ -10,5 +10,5 @@ F: configs/imx8mm-phygate-tauri-l_defconfig
F: configs/phycore-imx8mm_defconfig
F: doc/board/phytec/imx8mm-phygate-tauri-l.rst
F: doc/board/phytec/index.rst
-F: doc/board/phytec/phycore_imx8mm.rst
+F: doc/board/phytec/phycore-imx8mm.rst
F: include/configs/phycore_imx8mm.h
diff --git a/board/siemens/iot2050/MAINTAINERS b/board/siemens/iot2050/MAINTAINERS
index 1b525356c2d6..2964de6a1631 100644
--- a/board/siemens/iot2050/MAINTAINERS
+++ b/board/siemens/iot2050/MAINTAINERS
@@ -5,5 +5,5 @@ S: Maintained
F: board/siemens/iot2050/
F: include/configs/iot2050.h
F: configs/iot2050_defconfig
-F: arch/arm/dts/iot2050-*
+F: arch/arm/dts/*-iot2050-*
F: doc/board/siemens/iot2050.rst
diff --git a/board/sifive/unmatched/MAINTAINERS b/board/sifive/unmatched/MAINTAINERS
index e601a0f3288f..022434333ef9 100644
--- a/board/sifive/unmatched/MAINTAINERS
+++ b/board/sifive/unmatched/MAINTAINERS
@@ -3,6 +3,6 @@ M: Paul Walmsley <paul.walmsley@sifive.com>
M: Green Wan <green.wan@sifive.com>
S: Maintained
F: board/sifive/unmatched/
-F: doc/board/sifive/hifive-unmatched-fu740.rst
+F: doc/board/sifive/unmatched.rst
F: include/configs/sifive-unmatched.h
F: configs/sifive_unmatched_defconfig
diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS
index 938c2ca0ca01..1aadf5450b3c 100644
--- a/board/toradex/colibri-imx8x/MAINTAINERS
+++ b/board/toradex/colibri-imx8x/MAINTAINERS
@@ -2,8 +2,8 @@ Colibri iMX8X
M: Francesco Dolcini <francesco.dolcini@toradex.com>
W: http://developer.toradex.com/software/linux/linux-software
S: Maintained
-F: arch/arm/dts/fsl-imx8x-colibri.dts
-F: arch/arm/dts/fsl-imx8x-colibri-u-boot.dtsi
+F: arch/arm/dts/fsl-imx8qxp-colibri.dts
+F: arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
F: board/toradex/colibri-imx8x/
F: board/toradex/common/
F: configs/colibri-imx8x_defconfig
diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS
index 80770cc71a96..afdbb9b104ad 100644
--- a/board/toradex/colibri_imx7/MAINTAINERS
+++ b/board/toradex/colibri_imx7/MAINTAINERS
@@ -3,12 +3,12 @@ M: Francesco Dolcini <francesco.dolcini@toradex.com>
W: http://developer.toradex.com/software/linux/linux-software
W: https://www.toradex.com/community
S: Maintained
-F: arch/arm/boot/dts/imx7-colibri.dtsi
-F: arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
-F: arch/arm/boot/dts/imx7d-colibri.dtsi
-F: arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
-F: arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
-F: arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
+F: arch/arm/dts/imx7-colibri.dtsi
+F: arch/arm/dts/imx7-colibri-eval-v3.dtsi
+F: arch/arm/dts/imx7d-colibri.dtsi
+F: arch/arm/dts/imx7d-colibri-emmc.dtsi
+F: arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts
+F: arch/arm/dts/imx7d-colibri-eval-v3.dts
F: board/toradex/colibri_imx7/
F: board/toradex/common/
F: configs/colibri_imx7_defconfig
diff --git a/board/toradex/colibri_vf/MAINTAINERS b/board/toradex/colibri_vf/MAINTAINERS
index a41bd165a7ca..330324ff1d1e 100644
--- a/board/toradex/colibri_vf/MAINTAINERS
+++ b/board/toradex/colibri_vf/MAINTAINERS
@@ -6,7 +6,7 @@ S: Maintained
F: arch/arm/dts/vf-colibri.dtsi
F: arch/arm/dts/vf-colibri-eval-v3.dtsi
F: arch/arm/dts/vf610-colibri-eval-v3-u-boot.dtsi
-F: arch/arm/dts/vf610-colibri.dts
+F: arch/arm/dts/vf610-colibri.dtsi
F: board/toradex/colibri_vf/
F: board/toradex/common/
F: configs/colibri_vf_defconfig
diff --git a/board/toradex/smarc-imx8mp/MAINTAINERS b/board/toradex/smarc-imx8mp/MAINTAINERS
index f7fcef1c0921..77255a3e35aa 100644
--- a/board/toradex/smarc-imx8mp/MAINTAINERS
+++ b/board/toradex/smarc-imx8mp/MAINTAINERS
@@ -3,7 +3,7 @@ F: arch/arm/dts/imx8mp-toradex-smarc-dev-u-boot.dtsi
F: board/toradex/smarc-imx8mp/
F: board/toradex/common/
F: configs/toradex-smarc-imx8mp_defconfig
-F: doc/board/toradex/toradex-smarc-imx8mp.rst
+F: doc/board/toradex/smarc-imx8mp.rst
F: include/configs/toradex-smarc-imx8mp.h
M: Francesco Dolcini <francesco.dolcini@toradex.com>
S: Maintained
diff --git a/board/xilinx/zynqmp_r5/MAINTAINERS b/board/xilinx/zynqmp_r5/MAINTAINERS
index aa50e6dae5f5..0f096d2e71f1 100644
--- a/board/xilinx/zynqmp_r5/MAINTAINERS
+++ b/board/xilinx/zynqmp_r5/MAINTAINERS
@@ -3,5 +3,5 @@ M: Michal Simek <michal.simek@amd.com>
S: Maintained
F: arch/arm/dts/zynqmp-r5*
F: board/xilinx/zynqmp_r5/
-F: include/configs/xilinx_zynqmp_r5_*
+F: include/configs/xilinx_zynqmp_r5*
F: configs/xilinx_zynqmp_r5_*
diff --git a/board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS b/board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS
index 79981aa43f13..7e0842ae675c 100644
--- a/board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS
+++ b/board/xunlong/orangepi-5-ultra-rk3588/MAINTAINERS
@@ -1,6 +1,6 @@
ORANGEPI-5-RK3588-ULTRA
M: Niu Zhihong <zhihong@nzhnb.com>
S: Maintained
-F: board/xunlong/orangepi-5-rk3588-ultra
+F: board/xunlong/orangepi-5-ultra-rk3588
F: configs/orangepi-5-ultra-rk3588_defconfig
F: arch/arm/dts/rk3588-orangepi-5-ultra*
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 5/7] MAINTAINERS: Correct entries missed during renames
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
` (3 preceding siblings ...)
2026-09-10 20:03 ` [PATCH v3 4/7] MAINTAINERS: Fix "typo" and similar incorrect entries Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-10 20:03 ` [PATCH v3 6/7] MAINTAINERS: Removed files Tom Rini
2026-09-10 20:03 ` [PATCH v3 7/7] CI: Run scripts/check_maintainers_files.sh in the existing MAINTAINERS job Tom Rini
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
In some cases, files had been renamed or merged and their existing
MAINTAINERS entry was not updated to match. Correct these places.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Michal Simek <michal.simek@amd.com>
---
board/amlogic/p212/MAINTAINERS | 2 +-
board/amlogic/q200/MAINTAINERS | 2 +-
board/amlogic/s400/MAINTAINERS | 2 +-
board/engicam/imx6ul/MAINTAINERS | 5 ++---
board/keymile/km83xx/MAINTAINERS | 6 ++++--
board/qualcomm/dragonboard410c/MAINTAINERS | 2 +-
board/qualcomm/dragonboard820c/MAINTAINERS | 2 +-
board/qualcomm/dragonboard845c/MAINTAINERS | 2 --
board/qualcomm/qcs404-evb/MAINTAINERS | 2 --
board/renesas/eagle/MAINTAINERS | 2 +-
board/renesas/grpeach/MAINTAINERS | 2 +-
board/renesas/v3msk/MAINTAINERS | 2 +-
board/samsung/starqltechn/MAINTAINERS | 4 ++--
board/wandboard/MAINTAINERS | 2 +-
14 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/board/amlogic/p212/MAINTAINERS b/board/amlogic/p212/MAINTAINERS
index e73a4e52c1fd..869264285c37 100644
--- a/board/amlogic/p212/MAINTAINERS
+++ b/board/amlogic/p212/MAINTAINERS
@@ -3,7 +3,7 @@ M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
F: board/amlogic/p212/
-F: include/configs/p212.h
+F: include/configs/meson64.h
F: configs/khadas-vim_defconfig
F: configs/libretech-cc_defconfig
F: configs/libretech-cc_v2_defconfig
diff --git a/board/amlogic/q200/MAINTAINERS b/board/amlogic/q200/MAINTAINERS
index aece8d5e05c7..dba49eb33248 100644
--- a/board/amlogic/q200/MAINTAINERS
+++ b/board/amlogic/q200/MAINTAINERS
@@ -3,7 +3,7 @@ M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
F: board/amlogic/q200/
-F: include/configs/q200.h
+F: include/configs/meson64.h
F: configs/beelink-gt1-ultimate_defconfig
F: configs/khadas-vim2_defconfig
F: configs/libretech-s905d-pc_defconfig
diff --git a/board/amlogic/s400/MAINTAINERS b/board/amlogic/s400/MAINTAINERS
index ca51bb6b3ba1..2b909f4b276c 100644
--- a/board/amlogic/s400/MAINTAINERS
+++ b/board/amlogic/s400/MAINTAINERS
@@ -3,6 +3,6 @@ M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
L: u-boot-amlogic@groups.io
F: board/amlogic/s400/
-F: include/configs/s400.h
+F: include/configs/meson64.h
F: configs/s400_defconfig
F: doc/board/amlogic/s400.rst
diff --git a/board/engicam/imx6ul/MAINTAINERS b/board/engicam/imx6ul/MAINTAINERS
index b9c6af27245c..a1b5b1778421 100644
--- a/board/engicam/imx6ul/MAINTAINERS
+++ b/board/engicam/imx6ul/MAINTAINERS
@@ -7,12 +7,11 @@ F: include/configs/imx6-engicam.h
F: configs/imx6ul_geam_mmc_defconfig
F: configs/imx6ul_geam_nand_defconfig
F: configs/imx6ul_isiot_emmc_defconfig
-F: configs/imx6ul_isiot_mmc_defconfig
F: configs/imx6ul_isiot_nand_defconfig
F: arch/arm/dts/imx6ul.dtsi
F: arch/arm/dts/imx6ul-u-boot.dtsi
-F: arch/arm/dts/imx6ul-geam-kit.dts
-F: arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi
+F: arch/arm/dts/imx6ul-geam.dts
+F: arch/arm/dts/imx6ul-geam-u-boot.dtsi
F: arch/arm/dts/imx6ul-isiot.dtsi
F: arch/arm/dts/imx6ul-isiot-u-boot.dtsi
F: arch/arm/dts/imx6ul-isiot-emmc.dts
diff --git a/board/keymile/km83xx/MAINTAINERS b/board/keymile/km83xx/MAINTAINERS
index af0d6afb2b44..291d4f053355 100644
--- a/board/keymile/km83xx/MAINTAINERS
+++ b/board/keymile/km83xx/MAINTAINERS
@@ -5,10 +5,12 @@ S: Maintained
F: board/keymile/km83xx/
F: board/keymile/common/
F: board/keymile/scripts/
-F: include/configs/km8360.h
+F: include/configs/kmcoge5ne.h
+F: include/configs/kmeter1.h
+F: include/configs/km/km-mpc83xx.h
F: configs/kmcoge5ne_defconfig
F: configs/kmeter1_defconfig
-F: include/configs/tuxx1.h
+F: include/configs/km832x.h
F: configs/kmopti2_defconfig
F: configs/kmsupx5_defconfig
F: configs/kmtepr2_defconfig
diff --git a/board/qualcomm/dragonboard410c/MAINTAINERS b/board/qualcomm/dragonboard410c/MAINTAINERS
index 9c10fa3053b0..a8eae9a05485 100644
--- a/board/qualcomm/dragonboard410c/MAINTAINERS
+++ b/board/qualcomm/dragonboard410c/MAINTAINERS
@@ -4,5 +4,5 @@ R: Sam Day <me@samcday.com>
S: Maintained
F: board/qualcomm/dragonboard410c/
F: include/configs/dragonboard410c.h
-F: configs/dragonboard410c_defconfig
+F: configs/qcom_dragonboard410c_defconfig
F: doc/board/qualcomm/dragonboard410c.rst
diff --git a/board/qualcomm/dragonboard820c/MAINTAINERS b/board/qualcomm/dragonboard820c/MAINTAINERS
index 7ef905bdf69c..08fdb9903414 100644
--- a/board/qualcomm/dragonboard820c/MAINTAINERS
+++ b/board/qualcomm/dragonboard820c/MAINTAINERS
@@ -3,4 +3,4 @@ M: Jorge Ramirez-Ortiz <jorge.ramirez.ortiz@gmail.com>
S: Maintained
F: board/qualcomm/dragonboard820c/
F: include/configs/dragonboard820c.h
-F: configs/dragonboard820c_defconfig
+F: configs/qcom_dragonboard820c_defconfig
diff --git a/board/qualcomm/dragonboard845c/MAINTAINERS b/board/qualcomm/dragonboard845c/MAINTAINERS
index e555953df697..3b5c63459fe0 100644
--- a/board/qualcomm/dragonboard845c/MAINTAINERS
+++ b/board/qualcomm/dragonboard845c/MAINTAINERS
@@ -2,5 +2,3 @@ Qualcomm Robotics RB3 Development Platform (dragonboard845c)
M: Sumit Garg <sumit.garg@linaro.org>
S: Maintained
F: board/qualcomm/dragonboard845c/
-F: include/configs/dragonboard845c.h
-F: configs/dragonboard845c_defconfig
diff --git a/board/qualcomm/qcs404-evb/MAINTAINERS b/board/qualcomm/qcs404-evb/MAINTAINERS
index 0a2e194ff608..c6c672d6c3c4 100644
--- a/board/qualcomm/qcs404-evb/MAINTAINERS
+++ b/board/qualcomm/qcs404-evb/MAINTAINERS
@@ -2,5 +2,3 @@ Qualcomm Technologies, Inc. QCS404 evaluation board
M: Sumit Garg <sumit.garg@linaro.org>
S: Maintained
F: board/qualcomm/qcs404-evb/
-F: include/configs/qcs404-evb.h
-F: configs/qcs404evb_defconfig
diff --git a/board/renesas/eagle/MAINTAINERS b/board/renesas/eagle/MAINTAINERS
index c28b6502478c..8b458a3ca4d0 100644
--- a/board/renesas/eagle/MAINTAINERS
+++ b/board/renesas/eagle/MAINTAINERS
@@ -4,4 +4,4 @@ S: Maintained
F: arch/arm/dts/r8a77970-eagle*
F: board/renesas/eagle/
F: configs/r8a77970_eagle_defconfig
-F: include/configs/eagle.h
+F: include/configs/rcar-gen3-common.h
diff --git a/board/renesas/grpeach/MAINTAINERS b/board/renesas/grpeach/MAINTAINERS
index c0f4fbcbae16..37a3df5f2b52 100644
--- a/board/renesas/grpeach/MAINTAINERS
+++ b/board/renesas/grpeach/MAINTAINERS
@@ -7,7 +7,7 @@ F: configs/grpeach_defconfig
F: drivers/gpio/gpio-rza1.c
F: drivers/mtd/renesas_rpc_hf.c
F: drivers/net/sh_eth*
-F: drivers/pinctrl/renesas/pfc-r7s72100.c
+F: drivers/pinctrl/renesas/pinctrl-rza1.c
F: drivers/serial/serial_sh*
F: drivers/spi/renesas_rpc_spi.c
F: drivers/timer/ostm_timer.c
diff --git a/board/renesas/v3msk/MAINTAINERS b/board/renesas/v3msk/MAINTAINERS
index c198cf8c9b89..062133b0259e 100644
--- a/board/renesas/v3msk/MAINTAINERS
+++ b/board/renesas/v3msk/MAINTAINERS
@@ -5,4 +5,4 @@ S: Maintained
F: arch/arm/dts/r8a77970-v3msk*
F: board/renesas/v3msk/
F: configs/r8a77970_v3msk_defconfig
-F: include/configs/v3msk.h
+F: include/configs/rcar-gen3-common.h
diff --git a/board/samsung/starqltechn/MAINTAINERS b/board/samsung/starqltechn/MAINTAINERS
index 135cafdd69ca..7ca1a9bac896 100644
--- a/board/samsung/starqltechn/MAINTAINERS
+++ b/board/samsung/starqltechn/MAINTAINERS
@@ -2,5 +2,5 @@ Samsung S9 (SM-G9600)(starqltechn) Board
M: Dzmitry Sankouski <dsankouski@gmail.com>
S: Maintained
F: board/samsung/starqltechn/
-F: include/configs/starqltechn.h
-F: configs/starqltechn_defconfig
+F: include/configs/qcom.h
+F: configs/qcom_sdm845_spl_defconfig
diff --git a/board/wandboard/MAINTAINERS b/board/wandboard/MAINTAINERS
index 3c2a06cf09bc..f5a6db3aa9e7 100644
--- a/board/wandboard/MAINTAINERS
+++ b/board/wandboard/MAINTAINERS
@@ -3,7 +3,7 @@ M: Fabio Estevam <festevam@gmail.com>
S: Maintained
F: arch/arm/dts/imx6qdl-wandboard.dtsi
F: arch/arm/dts/imx6qdl-wandboard-revb1.dtsi
-F: arch/arm/dts/imx6dl-wandboard-revb1.dts
+F: arch/arm/dts/imx6dl-wandboard-revd1.dts
F: board/wandboard/
F: include/configs/wandboard.h
F: configs/wandboard_defconfig
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 6/7] MAINTAINERS: Removed files
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
` (4 preceding siblings ...)
2026-09-10 20:03 ` [PATCH v3 5/7] MAINTAINERS: Correct entries missed during renames Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
2026-09-10 20:03 ` [PATCH v3 7/7] CI: Run scripts/check_maintainers_files.sh in the existing MAINTAINERS job Tom Rini
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
Correct MAINTAINERS entries for files that have been removed. In most
cases this is because a given platform has moved to using OF_UPSTREAM
and so the local version of the file does not exist. In other cases,
sample defconfigs have either been merged or simply removed.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v3:
- Rebase on current next, add more since-removed files.
Cc: Michal Simek <michal.simek@amd.com>
---
MAINTAINERS | 1 -
board/LaCie/net2big_v2/MAINTAINERS | 4 ----
board/LaCie/netspace_v2/MAINTAINERS | 6 ------
board/Synology/ds116/MAINTAINERS | 1 -
board/altera/stratix10-socdk/MAINTAINERS | 1 -
board/atmel/at91sam9260ek/MAINTAINERS | 1 -
board/beacon/beacon-rzg2m/MAINTAINERS | 3 ---
board/embest/mx6boards/MAINTAINERS | 1 -
board/gardena/smart-gateway-mt7688/MAINTAINERS | 1 -
board/gateworks/gw_ventana/MAINTAINERS | 6 ------
board/ge/bx50v3/MAINTAINERS | 3 ---
board/intel/agilex-socdk/MAINTAINERS | 1 -
board/intel/agilex7m-socdk/MAINTAINERS | 1 -
board/intel/n5x-socdk/MAINTAINERS | 1 -
board/khadas/khadas-edge2-rk3588s/MAINTAINERS | 1 -
board/kontron/sl-mx6ul/MAINTAINERS | 7 +++----
board/mediatek/MAINTAINERS | 3 ---
board/mediatek/mt7981/MAINTAINERS | 2 --
board/mediatek/mt7986/MAINTAINERS | 4 ----
board/nxp/imx93_evk/MAINTAINERS | 1 -
board/nxp/ls1012afrdm/MAINTAINERS | 12 ++++--------
board/nxp/ls1012aqds/MAINTAINERS | 1 -
board/nxp/ls1012ardb/MAINTAINERS | 3 ---
board/nxp/ls1043aqds/MAINTAINERS | 7 -------
board/nxp/ls1043ardb/MAINTAINERS | 6 ------
board/nxp/ls1046aqds/MAINTAINERS | 7 -------
board/nxp/ls1046ardb/MAINTAINERS | 7 -------
board/nxp/ls1088a/MAINTAINERS | 9 ---------
board/nxp/ls2080aqds/MAINTAINERS | 4 ----
board/nxp/ls2080ardb/MAINTAINERS | 6 ------
board/nxp/lx2160a/MAINTAINERS | 2 --
board/nxp/mpc837xerdb/MAINTAINERS | 1 -
board/nxp/mx6slevk/MAINTAINERS | 2 --
board/nxp/p2041rdb/MAINTAINERS | 3 ---
board/nxp/t104xrdb/MAINTAINERS | 13 -------------
board/nxp/t208xqds/MAINTAINERS | 5 -----
board/nxp/t208xrdb/MAINTAINERS | 1 -
board/phytec/phycore_am68x/MAINTAINERS | 1 -
board/polyhex/imx8mp_debix_model_a/MAINTAINERS | 1 -
board/renesas/blanche/MAINTAINERS | 1 -
board/seeed/linkit-smart-7688/MAINTAINERS | 1 -
board/sunxi/MAINTAINERS | 2 --
board/toradex/colibri-imx6ull/MAINTAINERS | 1 -
board/traverse/ten64/MAINTAINERS | 1 -
board/xilinx/zynqmp/MAINTAINERS | 1 -
board/zyxel/nsa325/MAINTAINERS | 3 ---
46 files changed, 7 insertions(+), 143 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 341c308e3efc..d8727e6e68c5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -234,7 +234,6 @@ ARM BROADCOM BCM283X / BCM27XX
M: Matthias Brugger <mbrugger@suse.com>
M: Peter Robinson <pbrobinson@gmail.com>
S: Maintained
-F: arch/arm/dts/bcm283*
F: arch/arm/mach-bcm283x/
F: board/raspberrypi/
F: drivers/gpio/bcm2835_gpio.c
diff --git a/board/LaCie/net2big_v2/MAINTAINERS b/board/LaCie/net2big_v2/MAINTAINERS
index 66e82196794e..41a7f07e4a3d 100644
--- a/board/LaCie/net2big_v2/MAINTAINERS
+++ b/board/LaCie/net2big_v2/MAINTAINERS
@@ -1,12 +1,8 @@
NET2BIG_V2 BOARD
M: Simon Guinot <simon.guinot@sequanux.org>
S: Maintained
-F: arch/arm/dts/kirkwood-d2net.dts
F: arch/arm/dts/kirkwood-d2net-u-boot.dtsi
-F: arch/arm/dts/kirkwood-d2net.dtsi
-F: arch/arm/dts/kirkwood-net2big.dts
F: arch/arm/dts/kirkwood-net2big-u-boot.dtsi
-F: arch/arm/dts/kirkwood-netxbig.dtsi
F: board/LaCie/common/
F: board/LaCie/net2big_v2/
F: include/configs/lacie_kw.h
diff --git a/board/LaCie/netspace_v2/MAINTAINERS b/board/LaCie/netspace_v2/MAINTAINERS
index 03bc7874c164..1e0a50240781 100644
--- a/board/LaCie/netspace_v2/MAINTAINERS
+++ b/board/LaCie/netspace_v2/MAINTAINERS
@@ -1,15 +1,9 @@
NETSPACE_V2 BOARDS
M: Simon Guinot <simon.guinot@sequanux.org>
S: Maintained
-F: arch/arm/dts/kirkwood-is2.dts
F: arch/arm/dts/kirkwood-is2-u-boot.dtsi
-F: arch/arm/dts/kirkwood-ns2-common.dtsi
-F: arch/arm/dts/kirkwood-ns2.dts
-F: arch/arm/dts/kirkwood-ns2lite.dts
F: arch/arm/dts/kirkwood-ns2lite-u-boot.dtsi
-F: arch/arm/dts/kirkwood-ns2max.dts
F: arch/arm/dts/kirkwood-ns2max-u-boot.dtsi
-F: arch/arm/dts/kirkwood-ns2mini.dts
F: arch/arm/dts/kirkwood-ns2mini-u-boot.dtsi
F: arch/arm/dts/kirkwood-ns2-u-boot.dtsi
F: board/LaCie/common/
diff --git a/board/Synology/ds116/MAINTAINERS b/board/Synology/ds116/MAINTAINERS
index 8d3cc24fbef4..048ec9f10a1d 100644
--- a/board/Synology/ds116/MAINTAINERS
+++ b/board/Synology/ds116/MAINTAINERS
@@ -1,7 +1,6 @@
DS116 BOARD
M: Tony Dinh <mibodhi@gmail.com>
S: Maintained
-F: arch/arm/dts/armada-385-synology-ds116.dts
F: board/Synology/ds116/
F: board/Synology/common
F: include/configs/ds116.h
diff --git a/board/altera/stratix10-socdk/MAINTAINERS b/board/altera/stratix10-socdk/MAINTAINERS
index 6efd0cfc0560..6192bc917465 100644
--- a/board/altera/stratix10-socdk/MAINTAINERS
+++ b/board/altera/stratix10-socdk/MAINTAINERS
@@ -4,5 +4,4 @@ M: Dinh Nguyen <dinh.nguyen@intel.com>
S: Maintained
F: board/altera/stratix10-socdk/
F: include/configs/socfpga_stratix10_socdk.h
-F: configs/socfpga_stratix10_atf_defconfig
F: configs/socfpga_stratix10_defconfig
diff --git a/board/atmel/at91sam9260ek/MAINTAINERS b/board/atmel/at91sam9260ek/MAINTAINERS
index aa7898ef7469..28b11243feb5 100644
--- a/board/atmel/at91sam9260ek/MAINTAINERS
+++ b/board/atmel/at91sam9260ek/MAINTAINERS
@@ -9,7 +9,6 @@ F: configs/at91sam9260ek_nandflash_defconfig
F: configs/at91sam9g20ek_2mmc_nandflash_defconfig
F: configs/at91sam9g20ek_dataflash_cs0_defconfig
F: configs/at91sam9g20ek_dataflash_cs1_defconfig
-F: configs/at91sam9g20ek_mmc_defconfig
F: configs/at91sam9g20ek_2mmc_defconfig
F: configs/at91sam9g20ek_nandflash_defconfig
F: configs/at91sam9xeek_dataflash_cs0_defconfig
diff --git a/board/beacon/beacon-rzg2m/MAINTAINERS b/board/beacon/beacon-rzg2m/MAINTAINERS
index a4a920a017b0..b28272c58ee0 100644
--- a/board/beacon/beacon-rzg2m/MAINTAINERS
+++ b/board/beacon/beacon-rzg2m/MAINTAINERS
@@ -7,9 +7,6 @@ F: include/configs/beacon-rzg2m.h
F: configs/rzg2_beacon_defconfig
F: arch/arm/dts/beacon-renesom-baseboard.dtsi
F: arch/arm/dts/beacon-renesom-som.dtsi
-F: arch/arm/dts/r8a774a1-beacon-rzg2m-kit.dts
-F: arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts
-F: arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts
F: arch/arm/dts/r8a774a1-beacon-rzg2m-kit-u-boot.dtsi
F: arch/arm/dts/r8a774b1-beacon-rzg2n-kit-u-boot.dtsi
F: arch/arm/dts/r8a774e1-beacon-rzg2h-kit-u-boot.dtsi
diff --git a/board/embest/mx6boards/MAINTAINERS b/board/embest/mx6boards/MAINTAINERS
index 02756c58b3c8..0ffd4668b42d 100644
--- a/board/embest/mx6boards/MAINTAINERS
+++ b/board/embest/mx6boards/MAINTAINERS
@@ -5,4 +5,3 @@ F: board/embest/mx6boards/
F: include/configs/embestmx6boards.h
F: configs/marsboard_defconfig
F: configs/riotboard_defconfig
-F: configs/riotboard_spl_defconfig
diff --git a/board/gardena/smart-gateway-mt7688/MAINTAINERS b/board/gardena/smart-gateway-mt7688/MAINTAINERS
index bbb491c1ce6d..f241d5c3a5e5 100644
--- a/board/gardena/smart-gateway-mt7688/MAINTAINERS
+++ b/board/gardena/smart-gateway-mt7688/MAINTAINERS
@@ -4,5 +4,4 @@ S: Maintained
F: board/gardena/smart-gateway-mt7688
F: include/configs/gardena-smart-gateway-mt7688.h
F: configs/gardena-smart-gateway-mt7688_defconfig
-F: configs/gardena-smart-gateway-mt7688-ram_defconfig
F: arch/mips/dts/gardena-smart-gateway-mt7688.dts
diff --git a/board/gateworks/gw_ventana/MAINTAINERS b/board/gateworks/gw_ventana/MAINTAINERS
index f9872806c0c5..3d604b725b2c 100644
--- a/board/gateworks/gw_ventana/MAINTAINERS
+++ b/board/gateworks/gw_ventana/MAINTAINERS
@@ -15,7 +15,6 @@ F: arch/arm/dts/imx6dl-gw553x.dts
F: arch/arm/dts/imx6dl-gw560x.dts
F: arch/arm/dts/imx6dl-gw5903.dts
F: arch/arm/dts/imx6dl-gw5904.dts
-F: arch/arm/dts/imx6dl-gw5905.dts
F: arch/arm/dts/imx6dl-gw5907.dts
F: arch/arm/dts/imx6dl-gw5910.dts
F: arch/arm/dts/imx6dl-gw5912.dts
@@ -30,7 +29,6 @@ F: arch/arm/dts/imx6qdl-gw553x.dtsi
F: arch/arm/dts/imx6qdl-gw560x.dtsi
F: arch/arm/dts/imx6qdl-gw5903.dtsi
F: arch/arm/dts/imx6qdl-gw5904.dtsi
-F: arch/arm/dts/imx6qdl-gw5905.dtsi
F: arch/arm/dts/imx6qdl-gw5907.dtsi
F: arch/arm/dts/imx6qdl-gw5910.dtsi
F: arch/arm/dts/imx6qdl-gw5912.dtsi
@@ -38,17 +36,13 @@ F: arch/arm/dts/imx6qdl-gw5913.dtsi
F: arch/arm/dts/imx6q-gw51xx.dts
F: arch/arm/dts/imx6q-gw52xx.dts
F: arch/arm/dts/imx6q-gw53xx.dts
-F: arch/arm/dts/imx6q-gw5400-a.dts
F: arch/arm/dts/imx6q-gw54xx.dts
F: arch/arm/dts/imx6q-gw551x.dts
F: arch/arm/dts/imx6q-gw552x.dts
F: arch/arm/dts/imx6q-gw553x.dts
F: arch/arm/dts/imx6q-gw560x.dts
-F: arch/arm/dts/imx6q-gw5901.dts
-F: arch/arm/dts/imx6q-gw5902.dts
F: arch/arm/dts/imx6q-gw5903.dts
F: arch/arm/dts/imx6q-gw5904.dts
-F: arch/arm/dts/imx6q-gw5905.dts
F: arch/arm/dts/imx6q-gw5907.dts
F: arch/arm/dts/imx6q-gw5910.dts
F: arch/arm/dts/imx6q-gw5912.dts
diff --git a/board/ge/bx50v3/MAINTAINERS b/board/ge/bx50v3/MAINTAINERS
index 53a8d88a9043..9dacfaf99974 100644
--- a/board/ge/bx50v3/MAINTAINERS
+++ b/board/ge/bx50v3/MAINTAINERS
@@ -7,8 +7,5 @@ F: arch/arm/dts/imx6q-b650v3.dts
F: arch/arm/dts/imx6q-b850v3.dts
F: arch/arm/dts/imx6q-bx50v3*
F: board/ge/bx50v3/
-F: configs/ge_b450v3_defconfig
-F: configs/ge_b650v3_defconfig
-F: configs/ge_b850v3_defconfig
F: configs/ge_bx50v3_defconfig
F: include/configs/ge_bx50v3.h
diff --git a/board/intel/agilex-socdk/MAINTAINERS b/board/intel/agilex-socdk/MAINTAINERS
index fd05e9a4afb3..a90e9e91bb5a 100644
--- a/board/intel/agilex-socdk/MAINTAINERS
+++ b/board/intel/agilex-socdk/MAINTAINERS
@@ -4,7 +4,6 @@ M: Chee Hong Ang <chee.hong.ang@intel.com>
S: Maintained
F: board/intel/agilex-socdk/
F: include/configs/socfpga_agilex_socdk.h
-F: configs/socfpga_agilex_atf_defconfig
F: configs/socfpga_agilex_defconfig
SOCFPGA BOARD WITH VAB
diff --git a/board/intel/agilex7m-socdk/MAINTAINERS b/board/intel/agilex7m-socdk/MAINTAINERS
index eea2810d3287..c7cf80eb7e1f 100644
--- a/board/intel/agilex7m-socdk/MAINTAINERS
+++ b/board/intel/agilex7m-socdk/MAINTAINERS
@@ -3,7 +3,6 @@ M: Tien Fong Chee <tien.fong.chee@altera.com>
M: Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi@altera.com>
S: Maintained
F: arch/arm/dts/socfpga_soc64_u-boot.dtsi
-F: arch/arm/dts/socfpga_agilex7m*
F: arch/arm/mach-socfpga/spl_agilex7m.c
F: board/intel/agilex7m-socdk/
F: include/configs/socfpga_agilex7m_socdk.h
diff --git a/board/intel/n5x-socdk/MAINTAINERS b/board/intel/n5x-socdk/MAINTAINERS
index ca063a9f3f1d..0ef39964412c 100644
--- a/board/intel/n5x-socdk/MAINTAINERS
+++ b/board/intel/n5x-socdk/MAINTAINERS
@@ -5,5 +5,4 @@ S: Maintained
F: board/intel/n5x-socdk/
F: include/configs/socfpga_n5x_socdk.h
F: configs/socfpga_n5x_defconfig
-F: configs/socfpga_n5x_atf_defconfig
F: configs/socfpga_n5x_vab_defconfig
diff --git a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS
index c43f469589dd..2e7f43042ba3 100644
--- a/board/khadas/khadas-edge2-rk3588s/MAINTAINERS
+++ b/board/khadas/khadas-edge2-rk3588s/MAINTAINERS
@@ -3,4 +3,3 @@ M: Jacobe Zang <jacobe.zang@wesion.com>
S: Maintained
F: configs/khadas-edge2-rk3588s_defconfig
F: include/configs/khadas-edge2-rk3588s.h
-F: arch/arm/dts/rk3588s-khadas-edge2*
diff --git a/board/kontron/sl-mx6ul/MAINTAINERS b/board/kontron/sl-mx6ul/MAINTAINERS
index 9e9dff0361ce..8f23adeeae82 100644
--- a/board/kontron/sl-mx6ul/MAINTAINERS
+++ b/board/kontron/sl-mx6ul/MAINTAINERS
@@ -1,10 +1,9 @@
Kontron SL/BL i.MX6UL/ULL Boards (N63xx/N64xx)
M: Frieder Schrempf <frieder.schrempf@kontron.de>
S: Maintained
-F: arch/arm/dts/imx6ul-kontron-sl*
-F: arch/arm/dts/imx6ul-kontron-bl*
-F: arch/arm/dts/imx6ull-kontron-sl*
-F: arch/arm/dts/imx6ull-kontron-bl*
+F: arch/arm/dts/imx6ul-kontron-bl-common-u-boot.dtsi
+F: arch/arm/dts/imx6ul-kontron-bl-u-boot.dtsi
+F: arch/arm/dts/imx6ull-kontron-bl-u-boot.dtsi
F: board/kontron/sl-mx6ul
F: configs/kontron-sl-mx6ul_defconfig
F: doc/board/kontron/sl-mx6ul.rst
diff --git a/board/mediatek/MAINTAINERS b/board/mediatek/MAINTAINERS
index 47f91d6e81c9..510b7f3f5119 100644
--- a/board/mediatek/MAINTAINERS
+++ b/board/mediatek/MAINTAINERS
@@ -18,9 +18,6 @@ MT8188/MT8370/MT8390
M: Macpaul Lin <Macpaul.Lin@mediatek.com>
M: Julien Stephan <jstephan@baylibre.com>
S: Maintained
-F: arch/arm/dts/mt8188-u-boot.dtsi
-F: arch/arm/dts/mt8370-genio-510-evk-u-boot.dtsi
-F: arch/arm/dts/mt8390-genio-700-evk-u-boot.dtsi
F: configs/mt8188.config
F: configs/mt8370_genio_510_evk_defconfig
F: configs/mt8390_genio_700_evk_defconfig
diff --git a/board/mediatek/mt7981/MAINTAINERS b/board/mediatek/mt7981/MAINTAINERS
index e7592a7a548a..b75a5b0bfcfd 100644
--- a/board/mediatek/mt7981/MAINTAINERS
+++ b/board/mediatek/mt7981/MAINTAINERS
@@ -6,5 +6,3 @@ F: include/configs/mt7981.h
F: configs/mt7981_emmc_rfb_defconfig
F: configs/mt7981_rfb_defconfig
F: configs/mt7981_sd_rfb_defconfig
-F: configs/mt7981_spim_nand_rfb_defconfig
-F: configs/mt7981_spim_nor_rfb_defconfig
diff --git a/board/mediatek/mt7986/MAINTAINERS b/board/mediatek/mt7986/MAINTAINERS
index ddc078a567a8..ab09615f0bcf 100644
--- a/board/mediatek/mt7986/MAINTAINERS
+++ b/board/mediatek/mt7986/MAINTAINERS
@@ -6,7 +6,3 @@ F: include/configs/mt7986.h
F: configs/mt7986_rfb_defconfig
F: configs/mt7986a_bpir3_emmc_defconfig
F: configs/mt7986a_bpir3_sd_defconfig
-F: configs/mt7986a_emmc_rfb_defconfig
-F: configs/mt7986a_sd_rfb_defconfig
-F: configs/mt7986b_emmc_rfb_defconfig
-F: configs/mt7986b_sd_rfb_defconfig
diff --git a/board/nxp/imx93_evk/MAINTAINERS b/board/nxp/imx93_evk/MAINTAINERS
index 0c542aced873..311e80d1b476 100644
--- a/board/nxp/imx93_evk/MAINTAINERS
+++ b/board/nxp/imx93_evk/MAINTAINERS
@@ -4,6 +4,5 @@ S: Maintained
F: board/nxp/imx93_evk/
F: include/configs/imx93_evk.h
F: configs/imx93_11x11_evk_defconfig
-F: configs/imx93_11x11_evk_ld_defconfig
F: configs/imx93w_evk_defconfig
F: configs/imx93w_evk_inline_ecc_defconfig
diff --git a/board/nxp/ls1012afrdm/MAINTAINERS b/board/nxp/ls1012afrdm/MAINTAINERS
index a69c268e53b7..d931383e65be 100644
--- a/board/nxp/ls1012afrdm/MAINTAINERS
+++ b/board/nxp/ls1012afrdm/MAINTAINERS
@@ -3,15 +3,11 @@ M: Pramod Kumar <pramod.kumar_1@nxp.com>
S: Maintained
F: board/nxp/ls1012afrdm/
F: include/configs/ls1012afrdm.h
-F: configs/ls1012afrdm_qspi_defconfig
F: configs/ls1012afrdm_tfa_defconfig
-F: configs/ls1012afrwy_tfa_defconfig
-F: configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
LS1012AFRWY BOARD
M: Pramod Kumar <pramod.kumar_1@nxp.com>
-S: Maintained
-F: board/nxp/ls1012afrwy/
-F: include/configs/ls1012afrwy.h
-F: configs/ls1012afrwy_qspi_defconfig
-F: configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
+S: Maintained
+F: include/configs/ls1012afrwy.h
+F: configs/ls1012afrwy_tfa_defconfig
+F: configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls1012aqds/MAINTAINERS b/board/nxp/ls1012aqds/MAINTAINERS
index 2178df909929..52bf79ebd6fb 100644
--- a/board/nxp/ls1012aqds/MAINTAINERS
+++ b/board/nxp/ls1012aqds/MAINTAINERS
@@ -3,6 +3,5 @@ M: Pramod Kumar <pramod.kumar_1@nxp.com>
S: Maintained
F: board/nxp/ls1012aqds/
F: include/configs/ls1012aqds.h
-F: configs/ls1012aqds_qspi_defconfig
F: configs/ls1012aqds_tfa_defconfig
F: configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls1012ardb/MAINTAINERS b/board/nxp/ls1012ardb/MAINTAINERS
index 5dd2858a86c7..dfb852f5f537 100644
--- a/board/nxp/ls1012ardb/MAINTAINERS
+++ b/board/nxp/ls1012ardb/MAINTAINERS
@@ -3,15 +3,12 @@ M: Pramod Kumar <pramod.kumar_1@nxp.com>
S: Maintained
F: board/nxp/ls1012ardb/
F: include/configs/ls1012ardb.h
-F: configs/ls1012ardb_qspi_defconfig
F: configs/ls1012ardb_tfa_defconfig
F: configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
F: configs/ls1012a2g5rdb_tfa_defconfig
-F: configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
LS1012A2G5RDB BOARD
M: Pramod Kumar <pramod.kumar_1@nxp.com>
S: Maintained
F: board/nxp/ls1012ardb/
F: include/configs/ls1012a2g5rdb.h
-F: configs/ls1012a2g5rdb_qspi_defconfig
diff --git a/board/nxp/ls1043aqds/MAINTAINERS b/board/nxp/ls1043aqds/MAINTAINERS
index daea64483d2a..9e82c2c9f20c 100644
--- a/board/nxp/ls1043aqds/MAINTAINERS
+++ b/board/nxp/ls1043aqds/MAINTAINERS
@@ -3,12 +3,5 @@ M: Mingkai Hu <mingkai.hu@nxp.com>
S: Maintained
F: board/nxp/ls1043aqds/
F: include/configs/ls1043aqds.h
-F: configs/ls1043aqds_defconfig
-F: configs/ls1043aqds_nor_ddr3_defconfig
-F: configs/ls1043aqds_nand_defconfig
-F: configs/ls1043aqds_sdcard_ifc_defconfig
-F: configs/ls1043aqds_sdcard_qspi_defconfig
-F: configs/ls1043aqds_qspi_defconfig
-F: configs/ls1043aqds_lpuart_defconfig
F: configs/ls1043aqds_tfa_defconfig
F: configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls1043ardb/MAINTAINERS b/board/nxp/ls1043ardb/MAINTAINERS
index 4df5940ab713..14ea4d2492f1 100644
--- a/board/nxp/ls1043ardb/MAINTAINERS
+++ b/board/nxp/ls1043ardb/MAINTAINERS
@@ -3,11 +3,5 @@ M: Mingkai Hu <mingkai.hu@nxp.com>
S: Maintained
F: board/nxp/ls1043ardb/
F: include/configs/ls1043ardb.h
-F: configs/ls1043ardb_defconfig
-F: configs/ls1043ardb_nand_defconfig
-F: configs/ls1043ardb_sdcard_defconfig
F: configs/ls1043ardb_tfa_defconfig
F: configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
-F: configs/ls1043ardb_SECURE_BOOT_defconfig
-F: configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
-F: configs/ls1043ardb_nand_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls1046aqds/MAINTAINERS b/board/nxp/ls1046aqds/MAINTAINERS
index 792531f7f3ae..86c1c7e2c81f 100644
--- a/board/nxp/ls1046aqds/MAINTAINERS
+++ b/board/nxp/ls1046aqds/MAINTAINERS
@@ -3,12 +3,5 @@ M: Mingkai Hu <Mingkai.Hu@nxp.com>
S: Maintained
F: board/nxp/ls1046aqds/
F: include/configs/ls1046aqds.h
-F: configs/ls1046aqds_defconfig
-F: configs/ls1046aqds_nand_defconfig
-F: configs/ls1046aqds_sdcard_ifc_defconfig
-F: configs/ls1046aqds_sdcard_qspi_defconfig
-F: configs/ls1046aqds_qspi_defconfig
-F: configs/ls1046aqds_lpuart_defconfig
F: configs/ls1046aqds_tfa_defconfig
F: configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
-F: configs/ls1046aqds_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls1046ardb/MAINTAINERS b/board/nxp/ls1046ardb/MAINTAINERS
index bb5f6a64d7b4..ef5f7002002e 100644
--- a/board/nxp/ls1046ardb/MAINTAINERS
+++ b/board/nxp/ls1046ardb/MAINTAINERS
@@ -4,13 +4,6 @@ S: Maintained
F: board/nxp/ls1046ardb/
F: board/nxp/ls1046ardb/ls1046ardb.c
F: include/configs/ls1046ardb.h
-F: configs/ls1046ardb_qspi_defconfig
-F: configs/ls1046ardb_qspi_spl_defconfig
-F: configs/ls1046ardb_sdcard_defconfig
-F: configs/ls1046ardb_emmc_defconfig
F: configs/ls1046ardb_tfa_defconfig
F: configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
-F: configs/ls1046ardb_SECURE_BOOT_defconfig
-F: configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
-F: configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
F: doc/board/nxp/ls1046ardb.rst
diff --git a/board/nxp/ls1088a/MAINTAINERS b/board/nxp/ls1088a/MAINTAINERS
index 85f38fcf0c72..412ddc54599b 100644
--- a/board/nxp/ls1088a/MAINTAINERS
+++ b/board/nxp/ls1088a/MAINTAINERS
@@ -3,8 +3,6 @@ M: Ashish Kumar <Ashish.Kumar@nxp.com>
S: Maintained
F: board/nxp/ls1088a/
F: include/configs/ls1088ardb.h
-F: configs/ls1088ardb_qspi_defconfig
-F: configs/ls1088ardb_sdcard_qspi_defconfig
F: configs/ls1088ardb_tfa_defconfig
F: configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
@@ -13,23 +11,16 @@ M: Ashish Kumar <Ashish.Kumar@nxp.com>
S: Maintained
F: board/nxp/ls1088a/
F: include/configs/ls1088aqds.h
-F: configs/ls1088aqds_qspi_defconfig
-F: configs/ls1088aqds_sdcard_qspi_defconfig
-F: configs/ls1088aqds_defconfig
-F: configs/ls1088aqds_sdcard_ifc_defconfig
F: configs/ls1088aqds_tfa_defconfig
LS1088AQDS_QSPI_SECURE_BOOT BOARD
M: Udit Agarwal <udit.agarwal@nxp.com>
S: Maintained
-F: configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
LS1088ARDB_QSPI_SECURE_BOOT BOARD
M: Udit Agarwal <udit.agarwal@nxp.com>
S: Maintained
-F: configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
LS1088ARDB_SD_SECURE_BOOT BOARD
M: Udit Agarwal <udit.agarwal@nxp.com>
S: Maintained
-F: configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls2080aqds/MAINTAINERS b/board/nxp/ls2080aqds/MAINTAINERS
index 3659cec4cd86..9328a084e41e 100644
--- a/board/nxp/ls2080aqds/MAINTAINERS
+++ b/board/nxp/ls2080aqds/MAINTAINERS
@@ -3,11 +3,7 @@ M: Priyanka Jain <priyanka.jain@nxp.com>
M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
F: board/nxp/ls2080aqds/
-F: board/nxp/ls2080a/ls2080aqds.c
F: include/configs/ls2080aqds.h
-F: configs/ls2080aqds_defconfig
F: configs/ls2080aqds_nand_defconfig
F: configs/ls2080aqds_qspi_defconfig
-F: configs/ls2080aqds_sdcard_defconfig
F: configs/ls2088aqds_tfa_defconfig
-F: configs/ls2080aqds_SECURE_BOOT_defconfig
diff --git a/board/nxp/ls2080ardb/MAINTAINERS b/board/nxp/ls2080ardb/MAINTAINERS
index 867ebe99cace..8341609b6e99 100644
--- a/board/nxp/ls2080ardb/MAINTAINERS
+++ b/board/nxp/ls2080ardb/MAINTAINERS
@@ -3,30 +3,24 @@ M: Priyanka Jain <priyanka.jain@nxp.com>
M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
F: board/nxp/ls2080ardb/
-F: board/nxp/ls2080a/ls2080ardb.c
F: include/configs/ls2080ardb.h
-F: configs/ls2080ardb_defconfig
F: configs/ls2080ardb_nand_defconfig
LS2088A_QSPI-boot BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
-F: configs/ls2088ardb_qspi_defconfig
F: configs/ls2088ardb_tfa_defconfig
F: configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
LS2081ARDB BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
S: Maintained
-F: configs/ls2081ardb_defconfig
LS2080A_SECURE_BOOT BOARD
M: Udit Agarwal <udit.agarwal@nxp.com>
S: Maintained
-F: configs/ls2080ardb_SECURE_BOOT_defconfig
LS2088A_QSPI_SECURE_BOOT BOARD
M: Udit Agarwal <udit.agarwal@nxp.com>
S: Maintained
-F: configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
diff --git a/board/nxp/lx2160a/MAINTAINERS b/board/nxp/lx2160a/MAINTAINERS
index abdac1372d28..945366a99861 100644
--- a/board/nxp/lx2160a/MAINTAINERS
+++ b/board/nxp/lx2160a/MAINTAINERS
@@ -19,7 +19,6 @@ LX2160AQDS BOARD
M: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
-F: board/nxp/lx2160a/eth_lx2160aqds.h
F: include/configs/lx2160aqds.h
F: configs/lx2160aqds_tfa_defconfig
F: arch/arm/dts/fsl-lx2160a-qds.dts
@@ -33,7 +32,6 @@ LX2162AQDS BOARD
M: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
M: Wasim Khan <wasim.khan@nxp.com>
S: Maintained
-F: board/nxp/lx2160a/eth_lx2162aqds.h
F: include/configs/lx2162aqds.h
F: configs/lx2162aqds_tfa_defconfig
F: arch/arm/dts/fsl-lx2162a-qds.dts
diff --git a/board/nxp/mpc837xerdb/MAINTAINERS b/board/nxp/mpc837xerdb/MAINTAINERS
index 9b05a6ad4217..cc0a6acd8c38 100644
--- a/board/nxp/mpc837xerdb/MAINTAINERS
+++ b/board/nxp/mpc837xerdb/MAINTAINERS
@@ -4,4 +4,3 @@ S: Maintained
F: board/nxp/mpc837xerdb/
F: include/configs/MPC837XERDB.h
F: configs/MPC837XERDB_defconfig
-F: configs/MPC837XERDB_SLAVE_defconfig
diff --git a/board/nxp/mx6slevk/MAINTAINERS b/board/nxp/mx6slevk/MAINTAINERS
index 4410358ea08c..6b8d5f2ca2c8 100644
--- a/board/nxp/mx6slevk/MAINTAINERS
+++ b/board/nxp/mx6slevk/MAINTAINERS
@@ -5,5 +5,3 @@ S: Maintained
F: board/nxp/mx6slevk/
F: include/configs/mx6slevk.h
F: configs/mx6slevk_defconfig
-F: configs/mx6slevk_spl_defconfig
-F: configs/mx6slevk_spinor_defconfig
diff --git a/board/nxp/p2041rdb/MAINTAINERS b/board/nxp/p2041rdb/MAINTAINERS
index f0d5c1192ac6..d139dd518747 100644
--- a/board/nxp/p2041rdb/MAINTAINERS
+++ b/board/nxp/p2041rdb/MAINTAINERS
@@ -4,8 +4,5 @@ S: Maintained
F: board/nxp/p2041rdb/
F: include/configs/P2041RDB.h
F: configs/P2041RDB_defconfig
-F: configs/P2041RDB_NAND_defconfig
F: configs/P2041RDB_SDCARD_defconfig
-F: configs/P2041RDB_SECURE_BOOT_defconfig
F: configs/P2041RDB_SPIFLASH_defconfig
-F: configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
diff --git a/board/nxp/t104xrdb/MAINTAINERS b/board/nxp/t104xrdb/MAINTAINERS
index 5542530698d9..d0b5709df81f 100644
--- a/board/nxp/t104xrdb/MAINTAINERS
+++ b/board/nxp/t104xrdb/MAINTAINERS
@@ -3,24 +3,11 @@ M: Priyanka Jain <priyanka.jain@nxp.com>
S: Maintained
F: board/nxp/t104xrdb/
F: include/configs/T104xRDB.h
-F: configs/T1040RDB_defconfig
-F: configs/T1040RDB_NAND_defconfig
-F: configs/T1040RDB_SPIFLASH_defconfig
-F: configs/T1040D4RDB_defconfig
-F: configs/T1040D4RDB_NAND_defconfig
-F: configs/T1040D4RDB_SPIFLASH_defconfig
-F: configs/T1042RDB_defconfig
F: configs/T1042D4RDB_defconfig
F: configs/T1042D4RDB_NAND_defconfig
F: configs/T1042D4RDB_SPIFLASH_defconfig
-F: configs/T1042RDB_PI_defconfig
-F: configs/T1042RDB_PI_NAND_defconfig
-F: configs/T1042RDB_PI_SPIFLASH_defconfig
T1040RDB_SDCARD BOARD
M: Priyanka Jain <priyanka.jain@nxp.com>
S: Maintained
-F: configs/T1040RDB_SDCARD_defconfig
-F: configs/T1040D4RDB_SDCARD_defconfig
F: configs/T1042D4RDB_SDCARD_defconfig
-F: configs/T1042RDB_PI_SDCARD_defconfig
diff --git a/board/nxp/t208xqds/MAINTAINERS b/board/nxp/t208xqds/MAINTAINERS
index 56911e8fd154..3c94352ec997 100644
--- a/board/nxp/t208xqds/MAINTAINERS
+++ b/board/nxp/t208xqds/MAINTAINERS
@@ -8,11 +8,6 @@ F: configs/T2080QDS_NAND_defconfig
F: configs/T2080QDS_SDCARD_defconfig
F: configs/T2080QDS_SPIFLASH_defconfig
F: configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
-F: configs/T2081QDS_defconfig
-F: configs/T2081QDS_NAND_defconfig
-F: configs/T2081QDS_SDCARD_defconfig
-F: configs/T2081QDS_SPIFLASH_defconfig
-F: configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
T2080QDS_SECURE_BOOT BOARD
M: Ruchika Gupta <ruchika.gupta@nxp.com>
diff --git a/board/nxp/t208xrdb/MAINTAINERS b/board/nxp/t208xrdb/MAINTAINERS
index db58c79c2544..aa70c2424b5a 100644
--- a/board/nxp/t208xrdb/MAINTAINERS
+++ b/board/nxp/t208xrdb/MAINTAINERS
@@ -7,7 +7,6 @@ F: configs/T2080RDB_defconfig
F: configs/T2080RDB_NAND_defconfig
F: configs/T2080RDB_SDCARD_defconfig
F: configs/T2080RDB_SPIFLASH_defconfig
-F: configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
F: configs/T2080RDB_revD_defconfig
F: configs/T2080RDB_revD_NAND_defconfig
F: configs/T2080RDB_revD_SDCARD_defconfig
diff --git a/board/phytec/phycore_am68x/MAINTAINERS b/board/phytec/phycore_am68x/MAINTAINERS
index 5e175fdb9efe..ca61746f244b 100644
--- a/board/phytec/phycore_am68x/MAINTAINERS
+++ b/board/phytec/phycore_am68x/MAINTAINERS
@@ -3,7 +3,6 @@ M: Dominik Haller <d.haller@phytec.de>
L: upstream@lists.phytec.de
W: https://www.phytec.eu/en/produkte/system-on-modules/phycore-am68x-tda4x/
S: Maintained
-F: arch/arm/dts/k3-am68-phycore-som-ddr4-4gb.dtsi
F: arch/arm/dts/k3-am68-phyboard-izar-u-boot.dtsi
F: arch/arm/dts/k3-am68-phycore-som-binman.dtsi
F: arch/arm/dts/k3-am68-r5-phycore-som-4gb.dts
diff --git a/board/polyhex/imx8mp_debix_model_a/MAINTAINERS b/board/polyhex/imx8mp_debix_model_a/MAINTAINERS
index d3afa91c1188..0e07186413ae 100644
--- a/board/polyhex/imx8mp_debix_model_a/MAINTAINERS
+++ b/board/polyhex/imx8mp_debix_model_a/MAINTAINERS
@@ -1,7 +1,6 @@
DEBIX MODEL A BOARD (i.MX8M Plus)
M: Gilles Talis <gilles.talis@gmail.com>
S: Maintained
-F: arch/arm/dts/imx8mp-debix-model-a.dts
F: arch/arm/dts/imx8mp-debix-model-a-u-boot.dtsi
F: board/polyhex/imx8mp_debix_model_a/
F: include/configs/imx8mp_debix_model_a.h
diff --git a/board/renesas/blanche/MAINTAINERS b/board/renesas/blanche/MAINTAINERS
index 39fb93ed0836..c6d70a78ce69 100644
--- a/board/renesas/blanche/MAINTAINERS
+++ b/board/renesas/blanche/MAINTAINERS
@@ -2,7 +2,6 @@ BLANCHE BOARD
M: Marek Vasut <marek.vasut+renesas@mailbox.org>
M: Masakazu Mochizuki <masakazu.mochizuki.wd@hitachi.com>
S: Maintained
-F: arch/arm/dts/r8a7792*
F: board/renesas/blanche/
F: configs/blanche_defconfig
F: include/configs/blanche.h
diff --git a/board/seeed/linkit-smart-7688/MAINTAINERS b/board/seeed/linkit-smart-7688/MAINTAINERS
index f2186c1b9d72..5f24c9cecb57 100644
--- a/board/seeed/linkit-smart-7688/MAINTAINERS
+++ b/board/seeed/linkit-smart-7688/MAINTAINERS
@@ -4,5 +4,4 @@ S: Maintained
F: board/seeed/linkit-smart-7688
F: include/configs/linkit-smart-7688.h
F: configs/linkit-smart-7688_defconfig
-F: configs/linkit-smart-7688-ram_defconfig
F: arch/mips/dts/linkit-smart-7688.dts
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 775d0f7ae83c..df745f146494 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -50,10 +50,8 @@ F: configs/Bananapi_defconfig
F: configs/Bananapro_defconfig
F: configs/i12-tvbox_defconfig
F: configs/Linksprite_pcDuino3_defconfig
-F: configs/Linksprite_pcDuino3_fdt_defconfig
F: configs/Orangepi_defconfig
F: configs/Orangepi_mini_defconfig
-F: configs/qt840a_defconfig
F: configs/Wits_Pro_A20_DKT_defconfig
F: include/configs/sun8i.h
F: configs/sun8i_a23_evb_defconfig
diff --git a/board/toradex/colibri-imx6ull/MAINTAINERS b/board/toradex/colibri-imx6ull/MAINTAINERS
index 6c93e35cc65f..1ceb1c8eb1b3 100644
--- a/board/toradex/colibri-imx6ull/MAINTAINERS
+++ b/board/toradex/colibri-imx6ull/MAINTAINERS
@@ -9,7 +9,6 @@ F: arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
F: arch/arm/dts/imx6ull-colibri-eval-v3.dts
F: arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
F: arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
-F: arch/arm/dts/imx6ull-colibri-u-boot.dtsi
F: board/toradex/colibri-imx6ull/
F: board/toradex/common/
F: configs/colibri-imx6ull_defconfig
diff --git a/board/traverse/ten64/MAINTAINERS b/board/traverse/ten64/MAINTAINERS
index 7b53e8793858..590327b8d829 100644
--- a/board/traverse/ten64/MAINTAINERS
+++ b/board/traverse/ten64/MAINTAINERS
@@ -1,7 +1,6 @@
TEN64 BOARD
M: Mathew McBride <matt@traverse.com.au>
S: Maintained
-F: arch/arm/dts/fsl-ls1088a-ten64.dts
F: board/traverse/ten64/
F: board/traverse/common/
F: include/configs/ten64.h
diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS
index 8bc50e37e485..dd585bae790b 100644
--- a/board/xilinx/zynqmp/MAINTAINERS
+++ b/board/xilinx/zynqmp/MAINTAINERS
@@ -8,4 +8,3 @@ F: board/xilinx/common/
F: board/xilinx/zynqmp/
F: include/configs/xilinx_zynqmp*
F: configs/xilinx_zynqmp*
-F: configs/avnet_ultra96_rev1_defconfig
diff --git a/board/zyxel/nsa325/MAINTAINERS b/board/zyxel/nsa325/MAINTAINERS
index 013cb84b99d2..4a84d2437c3c 100644
--- a/board/zyxel/nsa325/MAINTAINERS
+++ b/board/zyxel/nsa325/MAINTAINERS
@@ -1,9 +1,6 @@
NSA325 BOARD
M: Tony Dinh <mibodhi@gmail.com>
S: Maintained
-F: arch/arm/dts/kirkwood-6282.dtsi
-F: arch/arm/dts/kirkwood-nsa325.dts
-F: arch/arm/dts/kirkwood-nsa3x0-common.dtsi
F: board/zyxel/nsa325/
F: include/configs/nsa325.h
F: configs/nsa325_defconfig
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v3 7/7] CI: Run scripts/check_maintainers_files.sh in the existing MAINTAINERS job
2026-09-10 20:03 [PATCH v3 0/7] Cleanup MAINTAINERS entries Tom Rini
` (5 preceding siblings ...)
2026-09-10 20:03 ` [PATCH v3 6/7] MAINTAINERS: Removed files Tom Rini
@ 2026-09-10 20:03 ` Tom Rini
6 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2026-09-10 20:03 UTC (permalink / raw)
To: u-boot; +Cc: Michal Simek
Rename the existing job that does some checking of MAINTAINERS file
contents already to be a little clearer that it's doing two things now,
and then also run scripts/check_maintainers_files.sh in this job.
Suggested-by: Michal Simek <michal.simek@amd.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
.azure-pipelines.yml | 3 ++-
.gitlab-ci.yml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 015fc15d5c29..5130058925d5 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -90,7 +90,7 @@ stages:
make infodocs
- job: maintainers
- displayName: 'Ensure all configs have MAINTAINERS entries'
+ displayName: 'Check all configs are in MAINTAINERS and validate MAINTAINERS'
pool:
vmImage: $(ubuntu_vm)
container:
@@ -99,6 +99,7 @@ stages:
steps:
- script: |
./tools/buildman/buildman --maintainer-check
+ ./scripts/check_maintainers_files.sh
- job: allyesconfig_and_tools
displayName: 'Ensure allyesconfig, tools-only and envtools build'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9831dd61bc18..e08068f1cbf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,11 +189,11 @@ docs:
- make htmldocs KDOC_WERROR=1
- make infodocs
-# ensure all configs have MAINTAINERS entries
-Check for configs without MAINTAINERS entry:
+Check all configs are in MAINTAINERS and validate MAINTAINERS:
extends: .testsuites
script:
- ./tools/buildman/buildman --maintainer-check
+ - ./scripts/check_maintainers_files.sh
# Ensure host tools build
Build allyesconfig, tools-only and envtools:
--
2.43.0
^ permalink raw reply related [flat|nested] 9+ messages in thread