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

[u-boot] / 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..935e551472c88369a77153927a550a9ee896c3ea 100644 (file)
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -6,12 +6,12 @@
 
 #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>
 
-u32 spl_boot_device(void)
+#include "../sbc/sbc-regs.h"
+#include "../soc-info.h"
+#include "boot-device.h"
+
+u32 spl_boot_device_raw(void)
 {
        if (boot_is_swapped())
                return BOOT_DEVICE_NOR;
@@ -32,8 +32,23 @@ 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;
        }
 }
+
+u32 spl_boot_device(void)
+{
+       u32 ret;
+
+       ret = spl_boot_device_raw();
+
+       return ret == BOOT_DEVICE_USB ? BOOT_DEVICE_NOR : ret;
+}