ARM: uniphier: merge two defconfig files
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 26 Feb 2016 09:59:41 +0000 (18:59 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Sun, 28 Feb 2016 18:50:16 +0000 (03:50 +0900)
commitfe7c95ee5c2e4a757941221ae3b624c78bdaf068
tree601185e6454c3f0e8818f1d6bc30f5e274b30349
parent4e651003e5413530aaea6ff00841ef52fb48b797
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>
configs/uniphier_pro5_defconfig [deleted file]
configs/uniphier_pxs2_ld6b_defconfig
doc/README.uniphier