summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 18:59:41 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-29 03:50:16 +0900
commitfe7c95ee5c2e4a757941221ae3b624c78bdaf068 (patch)
tree601185e6454c3f0e8818f1d6bc30f5e274b30349 /arch/arm/mach-uniphier
parent4e651003e5413530aaea6ff00841ef52fb48b797 (diff)
downloadtalos-obmc-uboot-fe7c95ee5c2e4a757941221ae3b624c78bdaf068.tar.gz
talos-obmc-uboot-fe7c95ee5c2e4a757941221ae3b624c78bdaf068.zip
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>
Diffstat (limited to 'arch/arm/mach-uniphier')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud