Matt wrote...

try disabling/deselecting SMMSTORE and see if that helps, assuming you are using the default CorebootPayloadPkg target

That has fixed it, thanks.

-Andy.