import changes to makeimage.sh, xilinx.dts and dmitri-io/config.vendor from wuhan-6-0-0 branch