I don't like it changing files this way, but it's basically what 9a5233f107 and a few others did.
9a5233f107
Port 58f40e0786 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
58f40e0786
Port 53afb61c84 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
53afb61c84