[U-Boot] Updating master with next

I've now merged next into master and pushed, along with re-applying the change that makes non-COFNIG_SYS_GENERIC_BOARD boards complain at run-time. I'm going to be grabbing some other patches shortly, of the type that easily conflict and I don't want to have to have them be rebased again.