kbuild1: rebase on master. v3 release candidate
kbuild2: rebase on u-boot/master.  v4 candidate