Rework the codebase to avoid unnecessary differences with upstream
Port d255ce2f1a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
d255ce2f1a