diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-06 07:57:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-06 07:57:33 -0500 |
| commit | bc0b99bd8b19599f670f42401de655fa9b44cd94 (patch) | |
| tree | 8f5294dc16657c32b1a401c13a1f2a0579ac62e2 /tools | |
| parent | b11f634b1c1be6ab419758c6596c673445e5ac70 (diff) | |
| parent | 0109db1cd1e63b35c1c84d6bc2ccaa26aa6b7ce3 (diff) | |
Merge tag 'xilinx-for-v2021.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2021.04
arm64:
- DT updates
microblaze:
- Add support for NOR device support
spi:
- Fix unaligned data write issue
nand:
- Minor code change
xilinx:
- Fru fix in limit calculation
- Fill git repo link for all Xilinx boards
video:
- Add support for seps525 spi display
tools:
- Minor Vitis file support
cmd/common
- Minor code indentation fixes
serial:
- Uartlite debug uart initialization fix
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 |