summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-23 18:35:11 -0400
committerTom Rini <trini@konsulko.com>2016-03-23 18:35:11 -0400
commitb5b84be8a7356d4c3618b6edcb501885e53569f5 (patch)
treef172eee81583287573c027189bf099385f22d2b5 /common
parentd085ecd61b9956cda0d37b89b5c538f54440fe58 (diff)
parente449e840c5adf728ddd308501af3115656aa9a60 (diff)
downloadu-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.zip
u-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.tar.gz
u-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.tar.bz2
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index e5167bf..82e7f58 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -210,9 +210,9 @@ struct boot_device_name boot_name_table[] = {
{ BOOT_DEVICE_RAM, "RAM" },
#endif
#ifdef CONFIG_SPL_MMC_SUPPORT
- { BOOT_DEVICE_MMC1, "MMC" },
- { BOOT_DEVICE_MMC2, "MMC" },
- { BOOT_DEVICE_MMC2_2, "MMC" },
+ { BOOT_DEVICE_MMC1, "MMC1" },
+ { BOOT_DEVICE_MMC2, "MMC2" },
+ { BOOT_DEVICE_MMC2_2, "MMC2_2" },
#endif
#ifdef CONFIG_SPL_NAND_SUPPORT
{ BOOT_DEVICE_NAND, "NAND" },