Cleanup -m 54xx kernels to latest standard