[U-Boot] U-Boot test failures; rebase on master