Someone submitted conflicting (and non-complete) distro bootconfig support for the Versatile board, so the patch needs changing, yet again. But at least it's getting smaller.
e206ea5b