[U-Boot] v1 and v2 merging