[U-Boot] arm/master merged