From 1aac2c77a10783732cb366f849555fabc7df2c80 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 09:30:24 -0500 Subject: [PATCH] unify: xyz_load_dtb -> loadftd: mk_mmc.sh/setup_sdcard.sh Signed-off-by: Robert Nelson --- mk_mmc.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 3b34ed2..b9be187 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -409,26 +409,26 @@ function boot_uenv_txt_template { cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} - xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + loadftd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} - xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + loadftd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} loadinitrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} - xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + loadftd=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} loadinitrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} - xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + loadftd=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} __EOF__ fi @@ -457,12 +457,12 @@ function boot_uenv_txt_template { __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_mmcboot=run loadkernel; run loadinitrd; run xyz_load_dtb; echo Booting from mmc ... + xyz_mmcboot=run loadkernel; run loadinitrd; run loadftd; echo Booting from mmc ... __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_mmcboot=run xyz_message; run loadkernel; run loadinitrd; run xyz_load_dtb; echo Booting from mmc ... + xyz_mmcboot=run xyz_message; run loadkernel; run loadinitrd; run loadftd; echo Booting from mmc ... __EOF__ fi