mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-05 02:36:39 +09:00
ARM: uniphier: move MMC code to a separate file
Currently, arch/arm/mach-uniphier/boot-mode/boot-mode.c is messed up with unrelated code; there is no reason why the "mmcsetn" command must be placed in this file. Split out the MMC code into arch/arm/mach-uniphier/mmc-first-dev.c. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
5c8c6da132
commit
e5957e8d69
|
@ -19,6 +19,7 @@ obj-y += reset.o
|
||||||
|
|
||||||
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
|
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
|
||||||
obj-y += pinctrl-glue.o
|
obj-y += pinctrl-glue.o
|
||||||
|
obj-$(CONFIG_MMC) += mmc-first-dev.o
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -100,41 +100,3 @@ u32 spl_boot_mode(const u32 boot_device)
|
||||||
|
|
||||||
return MMCSD_MODE_EMMCBOOT;
|
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
|
|
||||||
|
|
46
arch/arm/mach-uniphier/mmc-first-dev.c
Normal file
46
arch/arm/mach-uniphier/mmc-first-dev.c
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2016 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <mmc.h>
|
||||||
|
#include <linux/errno.h>
|
||||||
|
|
||||||
|
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",
|
||||||
|
""
|
||||||
|
);
|
Loading…
Reference in New Issue
Block a user