[PATCH] checkpatch: report ERROR only on disabling of fdt and initrd relocation

[PATCH] checkpatch: report ERROR only on disabling of fdt and initrd relocation

[Zhiqiang Hou]

From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Let the check pass when patches have these patterns in their context.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5696d3a5f3..cf59e2bb70 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2617,7 +2617,7 @@ sub u_boot_line {
 	}
 
 	# Do not disable fdt / initrd relocation
-	if ($rawline =~ /.*(fdt|initrd)_high=0xffffffff/) {
+	if ($rawline =~ /^\+.*(fdt|initrd)_high=0xffffffff/) {
 		ERROR("DISABLE_FDT_OR_INITRD_RELOC",
 		     "fdt or initrd relocation disabled at boot time\n" . $herecurr);
 	}
-- 
2.25.1

Re: [PATCH] checkpatch: report ERROR only on disabling of fdt and initrd relocation

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

On Wed, Dec 15, 2021 at 02:23:52PM +0800, Zhiqiang Hou wrote:

> From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
> 
> Let the check pass when patches have these patterns in their context.
> 
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]