ARM: uniphier: add eMMC boot support

[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 71abdef1f4d4a39a57d463c671e1e9751581aa06..2f2e45d2c161628e192bb4b3accbdbf2fafe6afb 100644 (file)
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -5,13 +5,14 @@
  */
 
 #include <common.h>
+#include <mmc.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;
@@ -28,8 +29,51 @@ u32 spl_boot_device(void)
        case SOC_UNIPHIER_PH1_PRO4:
        case SOC_UNIPHIER_PH1_SLD8:
                return ph1_ld4_boot_device();
+#endif
+#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;
+}
+
+u32 spl_boot_mode(void)
+{
+       struct mmc *mmc;
+
+       /*
+        * work around a bug in the Boot ROM of PH1-sLD3, LD4, Pro4, and sLD8:
+        *
+        * The boot ROM in these SoCs breaks the PARTITION_CONFIG [179] of
+        * Extended CSD register; when switching to the Boot Partition 1, the
+        * Boot ROM should issue the SWITCH command (CMD6) with Set Bits for
+        * the Access Bits, but in fact it uses Write Byte for the Access Bits.
+        * As a result, the BOOT_PARTITION_ENABLE field of the PARTITION_CONFIG
+        * is lost.  This bug was fixed for PH1-Pro5 and later SoCs.
+        *
+        * Fixup mmc->part_config here because it is used to determine the
+        * partition which the U-Boot image is read from.
+        */
+       mmc = find_mmc_device(0);
+       mmc->part_config &= ~EXT_CSD_BOOT_PART_NUM(PART_ACCESS_MASK);
+       mmc->part_config |= EXT_CSD_BOOT_PARTITION_ENABLE;
+
+       return MMCSD_MODE_EMMCBOOT;
+}