diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-04 10:14:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-23 10:15:13 -0500 |
| commit | 2a06da08e7897deb08c204df1c2f7853c4e61806 (patch) | |
| tree | 572edaaf0eb2892c1bcd17586ec11a0cff809831 | |
| parent | 0478dac62a9add8c73981a900ceaa6da732ae2bb (diff) | |
| download | u-boot-2a06da08e7897deb08c204df1c2f7853c4e61806.tar.gz | |
checkpatch.pl: Update CONFIG logic in U-Boot section
Now that all CONFIG symbols are in Kconfig, checkpatch.pl should check
for and error on any case of define/undef CONFIG_*.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rwxr-xr-x | scripts/checkpatch.pl | 8 | ||||
| -rw-r--r-- | tools/patman/test_checkpatch.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index fe13e265a3..ccfcbb3e12 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2630,10 +2630,10 @@ sub u_boot_line { "strl$1 is preferred over strn$1 because it always produces a nul-terminated string\n" . $herecurr); } - # use defconfig to manage CONFIG_CMD options - if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) { - ERROR("DEFINE_CONFIG_CMD", - "All commands are managed by Kconfig\n" . $herecurr); + # use Kconfig for all CONFIG symbols + if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_\w*)\b/) { + ERROR("DEFINE_CONFIG_SYM", + "All CONFIG symbols are managed by Kconfig\n" . $herecurr); } # Don't put common.h and dm.h in header files diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index 8960cd505f..4c2ab6e590 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -396,7 +396,7 @@ index 0000000..2234c87 """Test for enabling/disabling commands using preprocesor""" pm = PatchMaker() pm.add_line('common/main.c', '#undef CONFIG_CMD_WHICH') - self.check_single_message(pm, 'DEFINE_CONFIG_CMD', 'error') + self.check_single_message(pm, 'DEFINE_CONFIG_SYM', 'error') def test_barred_include_in_hdr(self): """Test for using a barred include in a header file""" |