Browse Source

conf: xxx_uEnv.txt: Use the default environment variables provided by uboot

Use environment variables defined by uboot to improve compatibility

Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
Samin Guo 11 months ago
parent
commit
87ada16c1c
2 changed files with 4 additions and 12 deletions
  1. 2 6
      conf/vf2_nvme_uEnv.txt
  2. 2 6
      conf/vf2_uEnv.txt

+ 2 - 6
conf/vf2_nvme_uEnv.txt

@@ -13,20 +13,16 @@ bootargs_ext=if test ${devnvme} = 0; then setenv bootargs "earlyprintk console=t
 #bootargs=earlyprintk console=ttyS0,115200 debug rootwait earlycon=sbi root=/dev/nvme0n1p4
 
 # for addr info
-fileaddr=0xa0000000
-fdtaddr=0x46000000
 # boot Linux flat or compressed 'Image' stored at 'kernel_addr_r'
-kernel_addr_r=0x40200000
-irdaddr=46100000
 irdsize=5f00000
 
 # Use the FDT in the FIT image..
 setupfdt1=fdt addr ${fdtaddr}; fdt resize;
 
-setupird=setexpr irdend ${irdaddr} + ${irdsize}; fdt set /chosen linux,initrd-start <0x0 0x${irdaddr}>; fdt set /chosen linux,initrd-end <0x0 0x${irdend}>
+setupird=setexpr irdend ${ramdisk_addr_r} + ${irdsize}; fdt set /chosen linux,initrd-start <0x0 0x${ramdisk_addr_r}>; fdt set /chosen linux,initrd-end <0x0 0x${irdend}>
 
 setupfdt2=fdt set /chosen bootargs "${bootargs}";
 
 bootwait=setenv _delay ${bootdelay}; echo ${_delay}; while test ${_delay} > 0; do sleep 1; setexpr _delay ${_delay} - 1; echo ${_delay}; done
 
-boot2=run bootargs_ext; nvme dev ${devnvme}; fatload nvme ${devnvme}:${partnum} ${fileaddr} ${fitfile}; bootm start ${fileaddr}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${fileaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${irdaddr}:${filesize} ${fdtaddr}
+boot2=run bootargs_ext; nvme dev ${devnvme}; fatload nvme ${devnvme}:${partnum} ${loadaddr} ${fitfile}; bootm start ${loadaddr}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${loadaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtaddr}

+ 2 - 6
conf/vf2_uEnv.txt

@@ -13,20 +13,16 @@ bootargs_ext=if test ${devnum} = 0; then setenv bootargs "earlyprintk console=tt
 #bootargs=earlyprintk console=ttyS0,115200 debug rootwait earlycon=sbi root=/dev/mmcblk1p4
 
 # for addr info
-fileaddr=0xa0000000
-fdtaddr=0x46000000
 # boot Linux flat or compressed 'Image' stored at 'kernel_addr_r'
-kernel_addr_r=0x40200000
-irdaddr=46100000
 irdsize=5f00000
 
 # Use the FDT in the FIT image..
 setupfdt1=fdt addr ${fdtaddr}; fdt resize;
 
-setupird=setexpr irdend ${irdaddr} + ${irdsize}; fdt set /chosen linux,initrd-start <0x0 0x${irdaddr}>; fdt set /chosen linux,initrd-end <0x0 0x${irdend}>
+setupird=setexpr irdend ${ramdisk_addr_r} + ${irdsize}; fdt set /chosen linux,initrd-start <0x0 0x${ramdisk_addr_r}>; fdt set /chosen linux,initrd-end <0x0 0x${irdend}>
 
 setupfdt2=fdt set /chosen bootargs "${bootargs}";
 
 bootwait=setenv _delay ${bootdelay}; echo ${_delay}; while test ${_delay} > 0; do sleep 1; setexpr _delay ${_delay} - 1; echo ${_delay}; done
 
-boot2=run bootargs_ext; mmc dev ${devnum}; fatload mmc ${devnum}:${partnum} ${fileaddr} ${fitfile}; bootm start ${fileaddr}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${fileaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${irdaddr}:${filesize} ${fdtaddr}
+boot2=run bootargs_ext; mmc dev ${devnum}; fatload mmc ${devnum}:${partnum} ${loadaddr} ${fitfile}; bootm start ${loadaddr}; run setupfdt1;run setupird;run setupfdt2; bootm loados ${loadaddr}; run chipa_set_linux; run cpu_vol_set; echo "Booting kernel in"; booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtaddr}