Merge branch 'boards-for-v3.18' into soc-init-delay-for-v3.18.base