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

[oweals/u-boot.git] / arch / arm / mach-uniphier / boot-mode / boot-mode-ld4.c

diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
index ef52d69584fe6ed12818cc9920efec9c3800b71a..b066ed9c4ba99308799d2ff943f5d15e03d1edfd 100644 (file)
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
@@ -36,14 +36,14 @@ struct boot_device_info boot_device_table[] = {
        {BOOT_DEVICE_NAND, "NAND (Mirror 1, ECC  8, ONFI,            Addr 5)"},
        {BOOT_DEVICE_NAND, "NAND (Mirror 1, ECC 16, ONFI,            Addr 5)"},
        {BOOT_DEVICE_NAND, "NAND (Mirror 1, ECC 24, ONFI,            Addr 5)"},
-       {BOOT_DEVICE_MMC1, "eMMC Boot (3.3V)"},
-       {BOOT_DEVICE_MMC1, "eMMC Boot (1.8V)"},
+       {BOOT_DEVICE_MMC1, "eMMC (3.3V)"},
+       {BOOT_DEVICE_MMC1, "eMMC (1.8V)"},
        {BOOT_DEVICE_NONE, "Reserved"},
        {BOOT_DEVICE_NONE, "Reserved"},
        {BOOT_DEVICE_NONE, "Reserved"},
        {BOOT_DEVICE_NONE, "Reserved"},
        {BOOT_DEVICE_NONE, "Reserved"},
-       {BOOT_DEVICE_NOR,  "NOR Boot"},
+       {BOOT_DEVICE_NOR,  "NOR  (XECS0)"},
 };
 
 static int get_boot_mode_sel(void)
@@ -51,7 +51,7 @@ static int get_boot_mode_sel(void)
        return (readl(SG_PINMON0) >> 1) & 0x1f;
 }
 
-u32 ph1_ld4_boot_device(void)
+u32 uniphier_ld4_boot_device(void)
 {
        int boot_mode;
 
@@ -60,7 +60,7 @@ u32 ph1_ld4_boot_device(void)
        return boot_device_table[boot_mode].type;
 }
 
-void ph1_ld4_boot_mode_show(void)
+void uniphier_ld4_boot_mode_show(void)
 {
        int mode_sel, i;