diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-29 08:00:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-29 08:00:53 -0500 |
| commit | 1e85aaf3723f0ecd06fcf62e2d2482749e1995d6 (patch) | |
| tree | 4726779c31fb724e6d1e22da052e90e9f2293372 /include | |
| parent | 9e1d65f36b83c5422ece3c0ea28d07a2246cb07f (diff) | |
| parent | 53265152d2e395bc363d9824a06a1ffd5df3438e (diff) | |
| download | u-boot-1e85aaf3723f0ecd06fcf62e2d2482749e1995d6.tar.gz u-boot-1e85aaf3723f0ecd06fcf62e2d2482749e1995d6.tar.xz u-boot-1e85aaf3723f0ecd06fcf62e2d2482749e1995d6.zip | |
Merge tag 'uniphier-v2020.04-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.04 (3rd)
- Enable ADMA and HS400 for the eMMC driver on 64-bit SoCs
- Add some convenient environment variables to handle SD card
- Sanitize the NAND controller reset sequence and its WP handling
- Sync DT with Linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b95fb9c93f..55fa85ed62 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -160,6 +160,7 @@ "emmcboot=mmcsetn && run bootcmd_mmc${mmc_first_dev}\0" \ "nandboot=run bootcmd_ubifs0\0" \ "norboot=run tftpboot\0" \ + "sdboot=sdsetn && run bootcmd_mmc${sd_first_dev}\0" \ "usbboot=run bootcmd_usb0\0" \ "emmcscript=setenv devtype mmc && " \ "mmcsetn && " \ @@ -170,6 +171,10 @@ "ubifsmount ubi0:boot && " \ "ubifsload ${loadaddr} ${script} && " \ "source $loadaddr\0" \ + "sdscript=setenv devtype mmc && " \ + "sdsetn && " \ + "setenv devnum ${sd_first_dev} && " \ + "run loadscript_fat\0" \ "norscript=echo Running ${script} from tftp ... && " \ "tftpboot ${script} &&" \ "source $loadaddr\0" \ @@ -196,6 +201,12 @@ "nand write $loadaddr 0 0x00020000 && " \ "tftpboot $third_image && " \ "nand write $loadaddr 0x00020000 0x001e0000\0" \ + "sdupdate=sdsetn &&" \ + "mmc dev $sd_first_dev &&" \ + "tftpboot $second_image && " \ + "mmc write $loadaddr 0 100 && " \ + "tftpboot $third_image && " \ + "mmc write $loadaddr 100 f00\0" \ "usbupdate=usb start &&" \ "tftpboot $second_image && " \ "usb write $loadaddr 0 100 && " \ |