kernel - CAM cleanup 2/N - adjust make upgrade