]> git.dujemihanovic.xyz Git - u-boot.git/commit
tools: zynqmp: Fix regex expression around XPm_ConfigObject
authorAdrian Fiergolski <adrian.fiergolski@fastree3d.com>
Tue, 24 Nov 2020 15:13:07 +0000 (16:13 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 4 Jan 2021 09:51:26 +0000 (10:51 +0100)
commitd42ab39f58e828c99a0cba6890e29986e87d11f5
tree74cdb0a29907f1a68f1458f243fef3a2b183655e
parent21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a
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>
tools/zynqmp_pm_cfg_obj_convert.py