diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-24 21:08:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-24 21:08:42 -0400 |
| commit | 12af9399e77c809fdf5f9776d5bc1865ceab577d (patch) | |
| tree | 9e1564e582e7c2cf2b74785a45e31632ffb91514 /arch/arm/mach-uniphier/board_late_init.c | |
| parent | 9a1d64809d51ddae40fe7802da18e8069f11cb43 (diff) | |
| parent | 4e7f8de42642cd0036dc78bf0df293f105cb5267 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/board_late_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 92dd6105e48..4bfa10b374a 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -64,27 +64,33 @@ int board_late_init(void) switch (uniphier_boot_device_raw()) { case BOOT_DEVICE_MMC1: - printf("eMMC Boot\n"); + printf("eMMC Boot"); setenv("bootmode", "emmcboot"); break; case BOOT_DEVICE_NAND: - printf("NAND Boot\n"); + printf("NAND Boot"); setenv("bootmode", "nandboot"); nand_denali_wp_disable(); break; case BOOT_DEVICE_NOR: - printf("NOR Boot\n"); + printf("NOR Boot"); setenv("bootmode", "norboot"); break; case BOOT_DEVICE_USB: - printf("USB Boot\n"); + printf("USB Boot"); setenv("bootmode", "usbboot"); break; default: - printf("Unknown\n"); + printf("Unknown"); break; } + if (uniphier_have_internal_stm()) + printf(" (STM: %s)", + uniphier_boot_from_backend() ? "OFF" : "ON"); + + printf("\n"); + if (uniphier_set_fdt_file()) printf("fdt_file environment was not set correctly\n"); |