GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-15 19:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'CR_4854_nvboot_shanlong.li' into 'jh7110-master'

Browse source 
CR_4854: uboot: evb support boot from nvme ssd

See merge request sdk/u-boot!53
This commit is contained in:
andy.hu 2023-05-10 11:45:10 +00:00
commit 1d7c5cefcf
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/starfive_evb_defconfig
View file

@ -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

16
include/configs/starfive-evb.h
View file

@ -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 \