mk_mmc.sh: unify mmcargs in bootscript

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 13 years ago
parent 89848f0d6b
commit f60ac3a41d

@ -557,6 +557,8 @@ function boot_uenv_txt_template {
xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ... xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ...
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} \${device_args}
__EOF__ __EOF__
cat > ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat > ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
@ -579,6 +581,8 @@ function boot_uenv_txt_template {
xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ... xyz_mmcboot=run xyz_load_uimage; run xyz_load_uinitrd; echo Booting from mmc ...
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} \${device_args}
__EOF__ __EOF__
if [ "x${ADDON}" == "xulcd" ] ; then if [ "x${ADDON}" == "xulcd" ] ; then
@ -599,7 +603,7 @@ case "$SYSTEM" in
beagle_bx) beagle_bx)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmcargs=setenv bootargs console=\${console} mpurate=\${mpurate} buddy=\${buddy} VIDEO_DISPLAY root=\${mmcroot} musb_hdrc.fifo_mode=5 device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
@ -607,7 +611,7 @@ uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
mmcargs=setenv bootargs console=\${console} \${optargs} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} musb_hdrc.fifo_mode=5 device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -615,7 +619,7 @@ uenv_normalboot_cmd
beagle_cx) beagle_cx)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmcargs=setenv bootargs console=\${console} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} musb_hdrc.fifo_mode=5 device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
@ -623,7 +627,7 @@ uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
mmcargs=setenv bootargs console=\${console} \${optargs} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} musb_hdrc.fifo_mode=5 device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -631,7 +635,7 @@ uenv_normalboot_cmd
beagle_xm) beagle_xm)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmcargs=setenv bootargs console=\${console} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
@ -639,7 +643,7 @@ uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
mmcargs=setenv bootargs console=\${console} \${optargs} mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} camera=\${camera} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} device_args=mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -647,15 +651,14 @@ uenv_normalboot_cmd
crane) crane)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmcargs=setenv bootargs console=\${console} VIDEO_DISPLAY root=\${mmcroot} device_args=
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
device_args=
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -663,16 +666,14 @@ uenv_normalboot_cmd
panda) panda)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
device_args=
mmcargs=setenv bootargs console=\${console} VIDEO_DISPLAY root=\${mmcroot}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
device_args=
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -680,15 +681,14 @@ uenv_normalboot_cmd
panda_es) panda_es)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmcargs=setenv bootargs console=\${console} VIDEO_DISPLAY root=\${mmcroot} device_args=
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
optargs=VIDEO_CONSOLE optargs=VIDEO_CONSOLE
device_args=
mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype}
loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd} loaduimage=run xyz_mmcboot; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
@ -696,15 +696,15 @@ uenv_normalboot_cmd
bone) bone)
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
mmc_args=run bootargs_defaults;setenv bootargs \${bootargs} root=\${mmcroot} device_args=ip=\${ip_method}
mmc_load_uimage=run xyz_mmcboot; run mmc_args; bootm \${address_uimage} \${address_uinitrd} mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_netinstall_cmd uenv_netinstall_cmd
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
mmc_args=run bootargs_defaults;setenv bootargs \${bootargs} root=\${mmcroot} rootfstype=\${mmcrootfstype} ip=\${ip_method} device_args=ip=\${ip_method}
mmc_load_uimage=run xyz_mmcboot; run mmc_args; bootm \${address_uimage} \${address_uinitrd} mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
uenv_normalboot_cmd uenv_normalboot_cmd
;; ;;
esac esac

Loading…
Cancel
Save