diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2023-05-10 14:45:10 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2023-05-10 14:45:10 +0300 |
| commit | 1d7c5cefcfa9c33cc8d3dc44adaaf296af175e68 (patch) | |
| tree | 5f82b1775e037043199c2d6a9fb0c6568caa64da | |
| parent | ac424aa034579385e7343cebf73ff86b2194da0f (diff) | |
| parent | c82a615162564ace2078e71702f7f7ce8c578873 (diff) | |
| download | u-boot-1d7c5cefcfa9c33cc8d3dc44adaaf296af175e68.tar.xz | |
Merge branch 'CR_4854_nvboot_shanlong.li' into 'jh7110-master'
CR_4854: uboot: evb support boot from nvme ssd
See merge request sdk/u-boot!53
| -rw-r--r-- | configs/starfive_evb_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/starfive-evb.h | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/configs/starfive_evb_defconfig b/configs/starfive_evb_defconfig index cb969592a2..0d6a48187c 100644 --- a/configs/starfive_evb_defconfig +++ b/configs/starfive_evb_defconfig @@ -28,7 +28,7 @@ CONFIG_SPI_BOOT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=tty1 console=ttyS0,115200 debug rootwait earlycon=sbi " CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="fatload mmc 0:3 $kernel_addr_r jh7110_uEnv.txt; env import -t $kernel_addr_r $filesize;run boot2" +CONFIG_BOOTCOMMAND="run mmcbootenv;run boot2" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run chipa_set_uboot" CONFIG_LOG_MAX_LEVEL=4 diff --git a/include/configs/starfive-evb.h b/include/configs/starfive-evb.h index 82d0e842b9..5f856026d4 100644 --- a/include/configs/starfive-evb.h +++ b/include/configs/starfive-evb.h @@ -140,6 +140,21 @@ "run cpu_vol_1040_set;" \ "fi; \0" +#define EVB_BOOTENV_NVME \ + "sdev_cmd=mmc\0" \ + "sdev_blk=mmcblk0p4\0" \ + "scan_nvme_dev=" \ + "if pci enum; then " \ + "nvme scan; " \ + "echo pci enum ...;" \ + "fi; " \ + "if nvme dev; then " \ + "setenv sdev_cmd nvme;" \ + "setenv sdev_blk nvme0n1p4;" \ + "fi; \0" \ + "mmcbootenv=run scan_nvme_dev; " \ + "fatload ${sdev_cmd} 0:3 $kernel_addr_r jh7110_uEnv.txt; " \ + "env import -t $kernel_addr_r $filesize; \0" #define CHIPA_GMAC_SET \ "chipa_gmac_set=" \ @@ -176,6 +191,7 @@ "ramdisk_addr_r=0x46100000\0" \ CHIPA_GMAC_SET \ CHIPA_SET \ + EVB_BOOTENV_NVME \ CPU_VOL_1020_SET \ CPU_VOL_1040_SET \ CPU_VOL_1060_SET \ |