checkpatch.pl: Make common.h check boarder

At this point in time we should not add common.h to any new files, so
make checkpatch.pl complain.

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Simon Glass <sjg@chromium.org>

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",

diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index a8bb364e42b22828cf01ba55565ab6134212b98f..f8117460ced2aef9f5f04a9d44dd250245557961 100644 (file)
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -238,7 +238,7 @@ index 0000000..2234c87
 + * passed to kernel in the ATAGs
 + */
 +
-+#include <common.h>
++#include <config.h>
 +
 +struct bootstage_record {
 +      u32 time_us;
@@ -401,10 +401,15 @@ index 0000000..2234c87
     def test_barred_include_in_hdr(self):
         """Test for using a barred include in a header file"""
         pm = PatchMaker()
-        #pm.add_line('include/myfile.h', '#include <common.h>')
         pm.add_line('include/myfile.h', '#include <dm.h>')
         self.check_single_message(pm, 'BARRED_INCLUDE_IN_HDR', 'error')
 
+    def test_barred_include_common_h(self):
+        """Test for adding common.h to a file"""
+        pm = PatchMaker()
+        pm.add_line('include/myfile.h', '#include <common.h>')
+        self.check_single_message(pm, 'BARRED_INCLUDE_COMMON_H', 'error')
+
     def test_config_is_enabled_config(self):
         """Test for accidental CONFIG_IS_ENABLED(CONFIG_*) calls"""
         pm = PatchMaker()