Merge pull request #1249 from masahir0y/uniphier

uniphier: fix and improve memory layout