Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / arm / mach-uniphier / boot-mode / boot-mode.c

diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index 60329eb10aa04ba255c84c72f7ef817d433499c1..0c5749badbb2c3146428005d0127b7c3f6926591 100644 (file)
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -6,10 +6,10 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/io.h>
-#include <mach/boot-device.h>
-#include <mach/sbc-regs.h>
-#include <mach/soc_info.h>
+
+#include "../sbc/sbc-regs.h"
+#include "../soc-info.h"
+#include "boot-device.h"
 
 u32 spl_boot_device(void)
 {
@@ -32,6 +32,12 @@ u32 spl_boot_device(void)
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
        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;