|
@@ -141,32 +141,52 @@
|
|
|
#define VF2_DISTRO_BOOTENV \
|
|
|
"fatbootpart=1:3\0" \
|
|
|
"distroloadaddr=0xb0000000\0" \
|
|
|
- "load_distro_uenv=" \
|
|
|
- "fatload mmc ${devnum}:3 ${distroloadaddr} /${bootenv}; " \
|
|
|
+ "bootdev=mmc\0" \
|
|
|
+ "scan_boot_dev=" \
|
|
|
+ "if test ${bootmode} = flash; then " \
|
|
|
+ "if pci enum; then " \
|
|
|
+ "nvme scan; " \
|
|
|
+ "echo pci enum ...;" \
|
|
|
+ "fi; " \
|
|
|
+ "if nvme dev; then " \
|
|
|
+ "setenv fatbootpart ${devnvme}:${nvmepart};" \
|
|
|
+ "setenv devnum ${devnvme};" \
|
|
|
+ "setenv bootdev nvme;" \
|
|
|
+ "else " \
|
|
|
+ "if mmc dev ${devnum}; then " \
|
|
|
+ "echo found device ${devnum};" \
|
|
|
+ "else " \
|
|
|
+ "setenv devnum 0;" \
|
|
|
+ "mmc dev 0;" \
|
|
|
+ "fi; " \
|
|
|
+ "fi; " \
|
|
|
+ "fi; \0" \
|
|
|
+ "load_distro_uenv=" \
|
|
|
+ "fatload ${bootdev} ${devnum}:3 ${distroloadaddr} /${bootenv}; " \
|
|
|
"setenv fatbootpart ${devnum}:3; " \
|
|
|
"env import ${distroloadaddr} 200; \0" \
|
|
|
"fdt_loaddtb=" \
|
|
|
- "fatload mmc ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile}; fdt addr ${fdt_addr_r}; \0" \
|
|
|
+ "fatload ${bootdev} ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile}; fdt addr ${fdt_addr_r}; \0" \
|
|
|
"fdt_sizecheck=" \
|
|
|
- "fatsize mmc ${fatbootpart} /dtbs/${fdtfile}; \0" \
|
|
|
+ "fatsize ${bootdev} ${fatbootpart} /dtbs/${fdtfile}; \0" \
|
|
|
"set_fdt_distro=" \
|
|
|
"if test ${chip_vision} = A; then " \
|
|
|
"if test ${memory_size} = 200000000; then " \
|
|
|
"run chipa_gmac_set;" \
|
|
|
"run visionfive2_mem_set;" \
|
|
|
- "fatwrite mmc ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
+ "fatwrite ${bootdev} ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
"else " \
|
|
|
"run chipa_gmac_set;" \
|
|
|
"run visionfive2_mem_set;" \
|
|
|
- "fatwrite mmc ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
+ "fatwrite ${bootdev} ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
"fi;" \
|
|
|
"else " \
|
|
|
"run visionfive2_mem_set;" \
|
|
|
"run cpu_vol_set;" \
|
|
|
- "fatwrite mmc ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
+ "fatwrite ${bootdev} ${fatbootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize};" \
|
|
|
"fi; \0" \
|
|
|
"bootcmd_distro=" \
|
|
|
- "run fdt_loaddtb; run fdt_sizecheck; run set_fdt_distro; sysboot mmc ${fatbootpart} fat c0000000 /${boot_syslinux_conf}; \0" \
|
|
|
+ "run fdt_loaddtb; run fdt_sizecheck; run set_fdt_distro; sysboot ${bootdev} ${fatbootpart} fat c0000000 /${boot_syslinux_conf}; \0" \
|
|
|
|
|
|
#define PARTS_DEFAULT \
|
|
|
"name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1};" \
|