Merge "uboot - add GBE diagnostics" into prism_dev