leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: zynqmp: Fix regex expression around XPm_ConfigObject

Browse Source 
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 <adrian.fiergolski@fastree3d.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Adrian Fiergolski 2020-11-24 16:13:07 +01:00 committed by Michal Simek
parent 21e1cae790
commit d42ab39f58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/zynqmp_pm_cfg_obj_convert.py
View File

@ -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