From 072a83d9100ccf6dbbd8ce004c22c632ff088ec8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 09:23:27 -0500 Subject: [PATCH] unify: xyz_load_image -> loadkernel: mk_mmc.sh/setup_sdcard.sh Signed-off-by: Robert Nelson --- mk_mmc.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 210f52e..44f7457 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -407,26 +407,26 @@ function boot_uenv_txt_template { if [ "${uboot_USE_MMC_DEFINES}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} + loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} xyz_load_initrd=${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} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} + loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} xyz_load_initrd=${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} __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} + loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} xyz_load_initrd=${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} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} + loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} xyz_load_initrd=${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} @@ -447,22 +447,22 @@ function boot_uenv_txt_template { if [ ! "${need_dtbs}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ... + xyz_mmcboot=run loadkernel; run xyz_load_initrd; echo Booting from mmc ... __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_mmcboot=run xyz_message; run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ... + xyz_mmcboot=run xyz_message; run loadkernel; run xyz_load_initrd; echo Booting from mmc ... __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ... + xyz_mmcboot=run loadkernel; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ... __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_mmcboot=run xyz_message; run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ... + xyz_mmcboot=run xyz_message; run loadkernel; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ... __EOF__ fi