Skip to content

Commit f3dea08

Browse files
committed
overlaycheck: Accept generic abc123x matches
Consider it a match if one or more parameters with digits as final characters enable a node with the same name but with 'x' substituted as the final character. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1 parent c3d0bfe commit f3dea08

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

overlaycheck/overlaycheck

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,12 +867,14 @@ sub container_checker
867867
foreach my $param (@$params)
868868
{
869869
next if (ref $param || ($exclude && $param =~ $exclude));
870+
my $paramx = $param;
871+
$paramx =~ s/\d$/x/;
870872
my $target = `fdtget -t bx "$TMPDIR/$name.dtbo" /__overrides__ $param`;
871873
chomp($target);
872874
next if ($target !~ /^0 0 0 0 /);
873875
error("Failed to merge $name with $basename") if (system($DTMERGE, $verbose ? ('-d') : (), $base, $MERGED_DTB, "$TMPDIR/$name.dtbo", $param) != 0);
874876
my $diffs = `dtdiff $base $MERGED_DTB`;
875-
if ($diffs !~ /^\+\s*$param@/m)
877+
if ($diffs !~ /^\+\s*$param@/m && $diffs !~ /^\+\s*$paramx@/m)
876878
{
877879
error("container_checker($name): parameter '$param' doesn't enable matching node");
878880
}

0 commit comments

Comments
 (0)