Explorar el Código

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
andy.hu hace 1 año
padre
commit
1d7c5cefcf
Se han modificado 2 ficheros con 17 adiciones y 1 borrados
  1. 1 1
      configs/starfive_evb_defconfig
  2. 16 0
      include/configs/starfive-evb.h

+ 1 - 1
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

+ 16 - 0
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				\