[PATCH 4/8] dtoc: Correct the re_compat regular expression

Walter Lozano wlozano at collabora.com
Mon Jul 5 20:04:26 CEST 2021


Hi Simon,

On 7/4/21 3:19 PM, Simon Glass wrote:
> This expects a . before the field name (.e.g '.compatible = ...) but
> presently accepts anything at all. Fix it.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>   tools/dtoc/src_scan.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Walter Lozano <walter.lozano at collabora.com>

Thanks!

Walter


>
> diff --git a/tools/dtoc/src_scan.py b/tools/dtoc/src_scan.py
> index 6c37a71e978..6e8e1ba51a0 100644
> --- a/tools/dtoc/src_scan.py
> +++ b/tools/dtoc/src_scan.py
> @@ -452,8 +452,8 @@ class Scanner:
>   
>           # Collect the compatible string, e.g. 'rockchip,rk3288-grf'
>           compat = None
> -        re_compat = re.compile(r'{\s*.compatible\s*=\s*"(.*)"\s*'
> -                               r'(,\s*.data\s*=\s*(\S*))?\s*},')
> +        re_compat = re.compile(r'{\s*\.compatible\s*=\s*"(.*)"\s*'
> +                               r'(,\s*\.data\s*=\s*(\S*))?\s*},')
>   
>           # This is a dict of compatible strings that were found:
>           #    key: Compatible string, e.g. 'rockchip,rk3288-grf'


More information about the U-Boot mailing list