diff options
| author | Hal Feng <hal.feng@starfivetech.com> | 2024-02-23 10:50:17 +0300 |
|---|---|---|
| committer | Hal Feng <hal.feng@starfivetech.com> | 2024-02-23 11:49:49 +0300 |
| commit | 66d87abc45d5fcbe210bfe816847e7db861a2043 (patch) | |
| tree | a18472cf6cb629502a065303a67d6152587a2d9e /include | |
| parent | f1b1c9ad3e64a9ac868042e898153b11828a5ea9 (diff) | |
| download | u-boot-66d87abc45d5fcbe210bfe816847e7db861a2043.tar.xz | |
Support specifying dtb in ${boot_syslinux_conf}
With this patch, you can specify dtb to bootup kernel,
using fdtdir in ${boot_syslinux_conf}.
Generally boot_syslinux_conf=extlinux/extlinux.conf
Signed-off-by: Yingpeng Liu <yingpeng.liu@starfivetech.com>
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/starfive-devkits.h | 10 | ||||
| -rw-r--r-- | include/configs/starfive-evb.h | 10 | ||||
| -rw-r--r-- | include/configs/starfive-visionfive2.h | 10 |
3 files changed, 3 insertions, 27 deletions
diff --git a/include/configs/starfive-devkits.h b/include/configs/starfive-devkits.h index 9ff0ef99f7..5a86c6f59d 100644 --- a/include/configs/starfive-devkits.h +++ b/include/configs/starfive-devkits.h @@ -256,17 +256,9 @@ "rootpart=4\0" \ "load_distro_uenv=" \ "fatload ${bootdev} ${devnum}:${bootpart} ${loadaddr} /${bootenv}; " \ - "env import ${loadaddr} ${filesize}; \0" \ - "fdt_loaddtb=" \ - "fatload ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile}; fdt addr ${fdt_addr_r}; \0" \ - "fdt_sizecheck=" \ - "fatsize ${bootdev} ${devnum}:${bootpart} /dtbs/${fdtfile}; \0" \ - "set_fdt_distro=" \ - "run chipa_set_linux; run cpu_vol_set;" \ - "fatwrite ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize}; \0" \ + "env import -t ${loadaddr} ${filesize}; \0" \ "bootcmd_distro=" \ "run load_distro_uenv; " \ - "run fdt_loaddtb; run fdt_sizecheck; run set_fdt_distro; " \ "sysboot ${bootdev} ${devnum}:${bootpart} fat ${scriptaddr} /${boot_syslinux_conf}; \0" \ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ diff --git a/include/configs/starfive-evb.h b/include/configs/starfive-evb.h index 9a64635f6d..a9ff995cb4 100644 --- a/include/configs/starfive-evb.h +++ b/include/configs/starfive-evb.h @@ -258,17 +258,9 @@ "rootpart=4\0" \ "load_distro_uenv=" \ "fatload ${bootdev} ${devnum}:${bootpart} ${loadaddr} /${bootenv}; " \ - "env import ${loadaddr} ${filesize}; \0" \ - "fdt_loaddtb=" \ - "fatload ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile}; fdt addr ${fdt_addr_r}; \0" \ - "fdt_sizecheck=" \ - "fatsize ${bootdev} ${devnum}:${bootpart} /dtbs/${fdtfile}; \0" \ - "set_fdt_distro=" \ - "run chipa_set_linux; run cpu_vol_set;" \ - "fatwrite ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize}; \0" \ + "env import -t ${loadaddr} ${filesize}; \0" \ "bootcmd_distro=" \ "run load_distro_uenv; " \ - "run fdt_loaddtb; run fdt_sizecheck; run set_fdt_distro; " \ "sysboot ${bootdev} ${devnum}:${bootpart} fat ${scriptaddr} /${boot_syslinux_conf}; \0" \ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h index 37a51004ca..30b60e85b0 100644 --- a/include/configs/starfive-visionfive2.h +++ b/include/configs/starfive-visionfive2.h @@ -263,17 +263,9 @@ "rootpart=4\0" \ "load_distro_uenv=" \ "fatload ${bootdev} ${devnum}:${bootpart} ${loadaddr} /${bootenv}; " \ - "env import ${loadaddr} ${filesize}; \0" \ - "fdt_loaddtb=" \ - "fatload ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile}; fdt addr ${fdt_addr_r}; \0" \ - "fdt_sizecheck=" \ - "fatsize ${bootdev} ${devnum}:${bootpart} /dtbs/${fdtfile}; \0" \ - "set_fdt_distro=" \ - "run chipa_set_linux; run cpu_vol_set;" \ - "fatwrite ${bootdev} ${devnum}:${bootpart} ${fdt_addr_r} /dtbs/${fdtfile} ${filesize}; \0" \ + "env import -t ${loadaddr} ${filesize}; \0" \ "bootcmd_distro=" \ "run load_distro_uenv; " \ - "run fdt_loaddtb; run fdt_sizecheck; run set_fdt_distro; " \ "sysboot ${bootdev} ${devnum}:${bootpart} fat ${scriptaddr} /${boot_syslinux_conf}; \0" \ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ |