From: Michal Simek Date: Wed, 25 Nov 2020 10:40:32 +0100 Subject: [PATCH v2] tools: zynqmp: Fix regex expression around XPm_ConfigObject. In-Reply-To: <20201124151306.153988-1-adrian.fiergolski@fastree3d.com> References: <20201124151306.153988-1-adrian.fiergolski@fastree3d.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 24. 11. 20 16:13, Adrian Fiergolski wrote: > The XPm_ConfigObject array definition generated by Vitis 2020.1 differs from previous Vivado versions (before 2019.2). > > -const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = { > +const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = > +#elif defined (__ICCARM__) > +#pragma location = ".sys_cfg_data" > +__root const u32 XPm_ConfigObject[] = > +#endif > +{ > > Change the matching regex to handle both cases. > > Signed-off-by: Adrian Fiergolski > --- > Changes in v2: > Fix the patch tile. > > tools/zynqmp_pm_cfg_obj_convert.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/zynqmp_pm_cfg_obj_convert.py b/tools/zynqmp_pm_cfg_obj_convert.py > index dd27f47921..0a44710e1e 100755 > --- a/tools/zynqmp_pm_cfg_obj_convert.py > +++ b/tools/zynqmp_pm_cfg_obj_convert.py > @@ -289,7 +289,7 @@ code = in_file.read() > code = re.sub('//.*?\n|/\*.*?\*/', '', code, flags=re.DOTALL) > > # remove everything outside the XPm_ConfigObject array definition > -code = re.search('const u32 XPm_ConfigObject.*= {\n(.*)};', > +code = re.search('const u32 XPm_ConfigObject.*=.*{\n(.*)};', > code, flags=re.DOTALL).group(1) > > # Process each comma-separated array item > Applied for next with two style fixes in commit message. Thanks, Michal