diff options
| author | Adrian Fiergolski <adrian.fiergolski@fastree3d.com> | 2020-11-24 16:13:07 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2021-01-04 10:51:26 +0100 |
| commit | d42ab39f58e828c99a0cba6890e29986e87d11f5 (patch) | |
| tree | 74cdb0a29907f1a68f1458f243fef3a2b183655e /tools | |
| parent | 21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a (diff) | |
| download | u-boot-d42ab39f58e828c99a0cba6890e29986e87d11f5.tar.gz | |
tools: zynqmp: Fix regex expression around XPm_ConfigObject
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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/zynqmp_pm_cfg_obj_convert.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |