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