Note that you should be able to flash TianoCore to the SPI safely now. At least, it worked for me. My instructions are here:
https://lists.centos.org/pipermail/arm-dev/2016-March/001743.html
Also while testing this, I went through the unbricking procedure documented in the manual .. twice. I can confirm that works as well :-)
Rich.