diff options
| author | shanlong.li <shanlong.li@starfivetech.com> | 2023-03-14 11:07:12 +0300 |
|---|---|---|
| committer | shanlong.li <shanlong.li@starfivetech.com> | 2023-03-30 11:46:25 +0300 |
| commit | 7f2dda162c9a0017ebea7b359dbd4b73ea196f2d (patch) | |
| tree | 9e9caa42e10fe972779729dfa5b294d214d1c4db /include/configs/starfive-visionfive2.h | |
| parent | 688befadf1d337dee3593e6cc0fe1c737cc150bd (diff) | |
| download | u-boot-7f2dda162c9a0017ebea7b359dbd4b73ea196f2d.tar.xz | |
configs: starfive: add nvme boot command
add nvme boot command
Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
Diffstat (limited to 'include/configs/starfive-visionfive2.h')
| -rw-r--r-- | include/configs/starfive-visionfive2.h | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h index db8b309ded..fafd1f9de6 100644 --- a/include/configs/starfive-visionfive2.h +++ b/include/configs/starfive-visionfive2.h @@ -204,6 +204,11 @@ "run visionfive2_mem_set;" \ "run chipa_gmac_set; \0" \ +#define VISIONFIVE2_BOOTENV_NVME \ + "nvmepart=3\0" \ + "devnvme=0\0" \ + "nvme_env=vf2_nvme_uEnv.txt\0" \ + #define VISIONFIVE2_BOOTENV \ "bootenv=uEnv.txt\0" \ "testenv=vf2_uEnv.txt\0" \ @@ -215,28 +220,37 @@ "ext4bootenv=" \ "ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0"\ "importbootenv=" \ - "echo Importing environment from mmc${devnum} ...; " \ + "echo Importing environment from ${devnum}/${devnvme} ...; "\ "env import -t ${loadaddr} ${filesize}\0" \ "scan_mmc_dev=" \ "if test ${bootmode} = flash; then " \ - "if mmc dev ${devnum}; then " \ - "echo found device ${devnum};" \ - "else " \ - "setenv devnum 0;" \ - "mmc dev 0;" \ + "if pci enum; then " \ + "nvme scan; " \ + "echo pci enum ...;" \ "fi; " \ - "fi; " \ - "echo bootmode ${bootmode} device ${devnum};\0" \ + "if nvme dev; then " \ + "setenv btpart ${devnvme}:${nvmepart};" \ + "setenv load_vf2_env fatload nvme ${btpart} ${loadaddr} ${nvme_env};" \ + "else " \ + "if mmc dev ${devnum}; then " \ + "echo found device ${devnum};" \ + "else " \ + "setenv devnum 0;" \ + "mmc dev 0;" \ + "fi; " \ + "if mmc rescan; then " \ + "run loadbootenv && run importbootenv; "\ + "run ext4bootenv && run importbootenv; "\ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...; " \ + "run uenvcmd; " \ + "fi; " \ + "fi; " \ + "fi; " \ + "fi; " \ + "echo bootmode ${bootmode} device ${devnum}/${devnvme};\0" \ "mmcbootenv=run scan_mmc_dev; " \ - "setenv bootpart ${devnum}:${mmcpart}; " \ - "if mmc rescan; then " \ - "run loadbootenv && run importbootenv; " \ - "run ext4bootenv && run importbootenv; " \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...; " \ - "run uenvcmd; " \ - "fi; " \ - "fi\0" \ + "setenv bootpart ${devnum}:${mmcpart};\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -250,6 +264,7 @@ "pxefile_addr_r=0x45900000\0" \ "ramdisk_addr_r=0x46100000\0" \ VF2_DISTRO_BOOTENV \ + VISIONFIVE2_BOOTENV_NVME \ VISIONFIVE2_BOOTENV \ CHIPA_GMAC_SET \ CHIPA_SET \ |