Merge with /home/wd/git/u-boot/stx-gp3ssa