Pull request: SoCFPGA changes for efi-2021-10-rc3