[U-Boot-Users] [PATCH 1/2] make MAKEALL more immune to merge conflicts