Merge "Removing efi build from uboot" into main