Sync from enjoy-digital/litex@53f1eaf57efc https://github.com/enjoy-digital/litex/commit/53f1eaf57efc8e87d72f9cacfc773b962b8e5f83
Sync from enjoy-digital/litex@31d609318acf https://github.com/enjoy-digital/litex/commit/31d609318acf816c1f82a7db1112205234bf6817