Cleanup -m 85xx kernels to latest standard