LoongArch architecture changes for 6.1 depend on the efi changes to work, so merge them to create a base.