tree 601185e6454c3f0e8818f1d6bc30f5e274b30349
parent 4e651003e5413530aaea6ff00841ef52fb48b797
author Masahiro Yamada <yamada.masahiro@socionext.com> 1456480781 +0900
committer Masahiro Yamada <yamada.masahiro@socionext.com> 1456685416 +0900

ARM: uniphier: merge two defconfig files

PH1-Pro5 support and ProXstream2/PH1-LD6b support can coexist in one
image and there is bit more room in SPL to accommodate all of them.
Merge uniphier_pro5_defconfig into uniphier_pxs2_defconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>