From 1712f8b2b748ec96442e36d733d421a7ebaa1168 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 3 Feb 2021 06:01:08 -0700 Subject: dtoc: Detect drivers only at the start of start of line If a driver declaration is included in a comment, dtoc currently gets confused. Update the parser to only consider declarations that begin at the start of a line. Since multi-line comments begin with an asterisk, this avoids the problem. Signed-off-by: Simon Glass --- tools/dtoc/src_scan.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/dtoc/src_scan.py b/tools/dtoc/src_scan.py index a275032179..bb22b0b64f 100644 --- a/tools/dtoc/src_scan.py +++ b/tools/dtoc/src_scan.py @@ -331,7 +331,7 @@ class Scanner: # Collect the driver name and associated Driver driver = None - re_driver = re.compile(r'UCLASS_DRIVER\((.*)\)') + re_driver = re.compile(r'^UCLASS_DRIVER\((.*)\)') # Collect the uclass ID, e.g. 'UCLASS_SPI' re_id = re.compile(r'\s*\.id\s*=\s*(UCLASS_[A-Z0-9_]+)') @@ -427,7 +427,7 @@ class Scanner: # Collect the driver info driver = None - re_driver = re.compile(r'U_BOOT_DRIVER\((.*)\)') + re_driver = re.compile(r'^U_BOOT_DRIVER\((.*)\)') # Collect the uclass ID, e.g. 'UCLASS_SPI' re_id = re.compile(r'\s*\.id\s*=\s*(UCLASS_[A-Z0-9_]+)') -- cgit v1.2.3