Merge pull request #1744 from jollysxilinx/integration

plat: xilinx: code restructure