Merge "refactor(plat/zynqmp): optimize the code to save some space" into integration