| commit | b165e2ceabaa2630fb8aaff57327d0a09dc88002 | [log] [tgz] |
|---|---|---|
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | Fri Feb 26 18:59:41 2016 +0900 |
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | Mon Feb 29 03:50:16 2016 +0900 |
| tree | 601185e6454c3f0e8818f1d6bc30f5e274b30349 | |
| parent | 392ecb6223137170aea513faecf649d973b1f86f [diff] |
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>