diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-28 22:00:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-28 22:00:24 -0500 |
| commit | 9735326fff8488663e27350917ccf01f2e71730a (patch) | |
| tree | b9ddf50bc81aec6f8223e244f9ccb22d4639cf6e /arch/arm/mach-uniphier/board_late_init.c | |
| parent | bea3d826203f90507ff32ed24bd0a3c53479e55c (diff) | |
| parent | 2001a81cba9554ee8b7f6d2ecd53510640ce4f35 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Please pull UniPhier updates v2019.01
- import DIV_ROUND_CLOSEST_ULL macro from Linux
- import improvement and fix of Denali NAND driver from Linux
- add NAND 200MHz clock to clk driver
- allow CONFIG_BOOTCOMMAND to run custom boot command/script
- sync DT with Linux 4.20
Diffstat (limited to 'arch/arm/mach-uniphier/board_late_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 1b871c62ce..972dbe8ae5 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -66,20 +66,20 @@ int board_late_init(void) switch (uniphier_boot_device_raw()) { case BOOT_DEVICE_MMC1: printf("eMMC Boot"); - env_set("bootcmd", "run bootcmd_mmc0; run distro_bootcmd"); + env_set("bootdev", "emmc"); break; case BOOT_DEVICE_NAND: printf("NAND Boot"); - env_set("bootcmd", "run bootcmd_ubifs0; run distro_bootcmd"); + env_set("bootdev", "nand"); nand_denali_wp_disable(); break; case BOOT_DEVICE_NOR: printf("NOR Boot"); - env_set("bootcmd", "run tftpboot; run distro_bootcmd"); + env_set("bootdev", "nor"); break; case BOOT_DEVICE_USB: printf("USB Boot"); - env_set("bootcmd", "run bootcmd_usb0; run distro_bootcmd"); + env_set("bootdev", "usb"); break; default: printf("Unknown"); |