diff options
| author | Andrew F. Davis <afd@ti.com> | 2019-08-12 15:59:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-20 11:46:11 -0400 |
| commit | 3d527364708aa37803161aad4bd13f2d31391e6f (patch) | |
| tree | e0f6ebacf24ceadb4a6c176cf77fae0fabd00062 /include | |
| parent | d2986a9bd8c06df52483e244f5c381e3cb899876 (diff) | |
configs: Rename environment variable fit_bootfile to name_fit
Like we did with 'fit_loadaddr' to 'addr_fit', the variable
'fit_bootfile' contains a name and so should be prefixed with
name_. Make this change here.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 4 | ||||
| -rw-r--r-- | include/configs/ti_armv7_keystone2.h | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ece329fc7d..2058f8de0f 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -53,8 +53,8 @@ #define DEFAULT_FIT_TI_ARGS \ "boot_fit=0\0" \ "addr_fit=0x90000000\0" \ - "fit_bootfile=fitImage\0" \ - "update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${fit_bootfile}\0" \ + "name_fit=fitImage\0" \ + "update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}\0" \ "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \ /* diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 401dec4493..03753c5b52 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -240,12 +240,10 @@ "get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \ "get_mon_nfs=nfs ${addr_mon} ${nfs_root}/boot/${name_mon}\0" \ "get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon}\0" \ - "get_fit_net=dhcp ${addr_fit} ${tftp_root}" \ - "/${fit_bootfile}\0" \ - "get_fit_nfs=nfs ${addr_fit} ${nfs_root}/boot/${fit_bootfile}\0"\ - "get_fit_ubi=ubifsload ${addr_fit} ${bootdir}/${fit_bootfile}\0"\ - "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \ - "${bootdir}/${fit_bootfile}\0" \ + "get_fit_net=dhcp ${addr_fit} ${tftp_root}/${name_fit}\0" \ + "get_fit_nfs=nfs ${addr_fit} ${nfs_root}/boot/${name_fit}\0" \ + "get_fit_ubi=ubifsload ${addr_fit} ${bootdir}/${name_fit}\0" \ + "get_fit_mmc=load mmc ${bootpart} ${addr_fit} ${bootdir}/${name_fit}\0" \ "get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot}\0" \ "get_uboot_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_uboot}\0" \ "burn_uboot_spi=sf probe; sf erase 0 0x100000; " \ @@ -261,8 +259,7 @@ "get_fdt_ramfs=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0" \ "get_kern_ramfs=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0" \ "get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \ - "get_fit_ramfs=dhcp ${addr_fit} ${tftp_root}" \ - "/${fit_bootfile}\0" \ + "get_fit_ramfs=dhcp ${addr_fit} ${tftp_root}/${name_fit}\0" \ "get_fs_ramfs=dhcp ${rdaddr} ${tftp_root}/${name_fs}\0" \ "get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi}\0" \ "get_ubi_nfs=nfs ${addr_ubi} ${nfs_root}/boot/${name_ubi}\0" \ |