Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'