After discussions with upstream this version of the patch was proposed
and is being submitted to upstream u-boot. Update to that version
(which is better than my workaround).
(From OE-Core rev: 048af2455aa65b25fd74bfe0e6d3a0af7562b42f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>