1 files changed, 0 insertions, 140 deletions
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
deleted file mode 100644
index a552770..0000000
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <mmc.h>
-#include <spl.h>
-#include <linux/errno.h>
-
-#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;
-
-	switch (uniphier_get_soc_id()) {
-#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-	case UNIPHIER_SLD3_ID:
-		return uniphier_sld3_boot_device();
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \
-	defined(CONFIG_ARCH_UNIPHIER_SLD8)
-	case UNIPHIER_LD4_ID:
-	case UNIPHIER_PRO4_ID:
-	case UNIPHIER_SLD8_ID:
-		return uniphier_ld4_boot_device();
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
-	case UNIPHIER_PRO5_ID:
-		return uniphier_pro5_boot_device();
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
-	case UNIPHIER_PXS2_ID:
-	case UNIPHIER_LD6B_ID:
-		return uniphier_pxs2_boot_device();
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11) || defined(CONFIG_ARCH_UNIPHIER_LD20)
-	case UNIPHIER_LD11_ID:
-	case UNIPHIER_LD20_ID:
-		return uniphier_ld20_boot_device();
-#endif
-	default:
-		return BOOT_DEVICE_NONE;
-	}
-}
-
-u32 spl_boot_device(void)
-{
-	u32 mode;
-
-	mode = spl_boot_device_raw();
-
-	switch (uniphier_get_soc_id()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
-	case UNIPHIER_PXS2_ID:
-	case UNIPHIER_LD6B_ID:
-		if (mode == BOOT_DEVICE_USB)
-			mode = BOOT_DEVICE_NOR;
-		break;
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11) || defined(CONFIG_ARCH_UNIPHIER_LD20)
-	case UNIPHIER_LD11_ID:
-	case UNIPHIER_LD20_ID:
-		if (mode == BOOT_DEVICE_MMC1 || mode == BOOT_DEVICE_USB)
-			mode = BOOT_DEVICE_BOARD;
-		break;
-#endif
-	default:
-		break;
-	}
-
-	return mode;
-}
-
-u32 spl_boot_mode(const u32 boot_device)
-{
-	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;
-}
-
-#if defined(CONFIG_DM_MMC) && !defined(CONFIG_SPL_BUILD)
-static int find_first_mmc_device(void)
-{
-	struct mmc *mmc;
-	int i;
-
-	for (i = 0; (mmc = find_mmc_device(i)); i++) {
-		if (!mmc_init(mmc) && IS_MMC(mmc))
-			return i;
-	}
-
-	return -ENODEV;
-}
-
-int mmc_get_env_dev(void)
-{
-	return find_first_mmc_device();
-}
-
-static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int dev;
-
-	dev = find_first_mmc_device();
-	if (dev < 0)
-		return CMD_RET_FAILURE;
-
-	setenv_ulong("mmc_first_dev", dev);
-	return CMD_RET_SUCCESS;
-}
-
-U_BOOT_CMD(
-	   mmcsetn,	1,	1,	do_mmcsetn,
-	"Set the first MMC (not SD) dev number to \"mmc_first_dev\" environment",
-	""
-);
-#endif