summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/boot-mode/boot-mode.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-22 00:27:41 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-25 00:59:33 +0900
commit019df879a93e266ac19f5eb00e4ee605db279b14 (patch)
treeb11ab5f86fa406775d870b1a51b2cf44fc8f7acc /arch/arm/mach-uniphier/boot-mode/boot-mode.c
parent28f40d4a4db2b6c701d349fd4fac286d21369de2 (diff)
downloadtalos-obmc-uboot-019df879a93e266ac19f5eb00e4ee605db279b14.tar.gz
talos-obmc-uboot-019df879a93e266ac19f5eb00e4ee605db279b14.zip
ARM: uniphier: add ProXstream2 and PH1-LD6b support
The DDR SDRAM initialization code has not been mainlined yet, but U-Boot proper should work. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/boot-mode/boot-mode.c')
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index 60329eb10a..c6cafa7919 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -33,6 +33,12 @@ u32 spl_boot_device(void)
case SOC_UNIPHIER_PH1_PRO5:
return ph1_pro5_boot_device();
#endif
+#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) || \
+ defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
+ case SOC_UNIPHIER_PROXSTREAM2:
+ case SOC_UNIPHIER_PH1_LD6B:
+ return proxstream2_boot_device();
+#endif
default:
return BOOT_DEVICE_NONE;
}
OpenPOWER on IntegriCloud