Cleanup -m 131xx kernels to latest standard