carl9170: config: fix patching errors and update CMakeFiles