Merge tag 'v2024.01-rc3' into next

[thirdparty/u-boot.git] / scripts / checkpatch.pl

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 488d73a0ed778090293cfbaa84ea7545f87bb4ac..b8eb57f38c74ae2feae98f9021d2c408ab579bbb 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2636,12 +2636,18 @@ sub u_boot_line {
                      "All CONFIG symbols are managed by Kconfig\n" . $herecurr);
        }
 
-       # Don't put common.h and dm.h in header files
-       if ($realfile =~ /\.h$/ && $rawline =~ /^\+#include\s*<(common|dm)\.h>*/) {
+       # Don't put dm.h in header files
+       if ($realfile =~ /\.h$/ && $rawline =~ /^\+#include\s*<dm\.h>*/) {
                ERROR("BARRED_INCLUDE_IN_HDR",
                      "Avoid including common.h and dm.h in header files\n" . $herecurr);
        }
 
+       # Don't add common.h to files
+       if ($rawline =~ /^\+#include\s*<common\.h>*/) {
+               ERROR("BARRED_INCLUDE_COMMON_H",
+                     "Do not add common.h to files\n" . $herecurr);
+       }
+
        # Do not disable fdt / initrd relocation
        if ($rawline =~ /^\+.*(fdt|initrd)_high=0xffffffff/) {
                ERROR("DISABLE_FDT_OR_INITRD_RELOC",