From: Masahiro Yamada Date: Thu, 28 Apr 2016 06:37:13 +0000 (+0900) Subject: ARM: uniphier: fix boot mode table of PH1-LD20 X-Git-Tag: v2016.05~43^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=68340966e6766f1add5ab5137693abf02c9f9ab6;p=oweals%2Fu-boot.git ARM: uniphier: fix boot mode table of PH1-LD20 PH1-LD20 does not have the dedicated boot swap select latch. Instead, it is controlled from the boot mode select. Signed-off-by: Masahiro Yamada --- diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c index 100275e6cb..b092c1bde8 100644 --- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c +++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c @@ -43,7 +43,7 @@ static struct boot_device_info boot_device_table[] = { {BOOT_DEVICE_MMC1, "eMMC (High Speed SDR, 8bit, 1.8V, Training Off)"}, {BOOT_DEVICE_MMC1, "eMMC (High Speed SDR, 8bit, 1.8V, Training On)"}, {BOOT_DEVICE_MMC1, "eMMC (Legacy, 4bit, 1.8V, Training Off)"}, - {BOOT_DEVICE_NONE, "Reserved"}, + {BOOT_DEVICE_NOR, "NOR Boot (XECS1)"}, }; static int get_boot_mode_sel(void)