If you haven't started planning your exit from x86 and you value open source then you really should start. It looks as if future Intel CPUs will be even less friendly to open source firmware then they already are. If you think AMD will be your savior then think again as they don't even support Core Boot currently; use the PSP and have closed source firmware on their GPUs.
https://www.phoronix.com/scan.php?page=news_item&px=Intel-USF-FSP-3.0-Less-OSF