From f2b7e76301618ac472b7ff25b737f053e1712c2d Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 09:43:12 -0500 Subject: [PATCH] unify: add boot_classic/boot_ftd to make it easier to switch: mk_mmc.sh/setup_sdcard.sh Signed-off-by: Robert Nelson --- mk_mmc.sh | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index b9be187..acc5186 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -411,12 +411,18 @@ function boot_uenv_txt_template { loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} loadftd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + boot_classic=run loadkernel; run loadinitrd + boot_ftd=run loadkernel; run loadinitrd; run loadftd + __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} loadftd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + boot_classic=run loadkernel; run loadinitrd + boot_ftd=run loadkernel; run loadinitrd; run loadftd + __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ @@ -424,12 +430,18 @@ function boot_uenv_txt_template { loadinitrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} loadftd=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + boot_classic=run loadkernel; run loadinitrd + boot_ftd=run loadkernel; run loadinitrd; run loadftd + __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} loadftd=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile} + boot_classic=run loadkernel; run loadinitrd + boot_ftd=run loadkernel; run loadinitrd; run loadftd + __EOF__ fi @@ -447,22 +459,30 @@ function boot_uenv_txt_template { if [ ! "${need_dtbs}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_mmcboot=run loadkernel; run loadinitrd; echo Booting from mmc ... + #Board File: + xyz_mmcboot=run boot_classic; echo Booting from mmc ... + #Device Tree File: + #xyz_mmcboot=run boot_ftd; echo Booting from mmc ... __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_mmcboot=run xyz_message; run loadkernel; run loadinitrd; echo Booting from mmc ... + #Board File: + xyz_mmcboot=run xyz_message; run boot_classic; echo Booting from mmc ... __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - xyz_mmcboot=run loadkernel; run loadinitrd; run loadftd; echo Booting from mmc ... + #Board File: + #xyz_mmcboot=run boot_classic; echo Booting from mmc ... + #Device Tree File: + xyz_mmcboot=run boot_ftd; echo Booting from mmc ... __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - xyz_mmcboot=run xyz_message; run loadkernel; run loadinitrd; run loadftd; echo Booting from mmc ... + #Device Tree File: + xyz_mmcboot=run xyz_message; run boot_ftd; echo Booting from mmc ... __EOF__ fi