sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

defaultenv: simplify scripting 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2011-09-25 22:54:04 +02:00 committed by Sascha Hauer
parent 5cd360c295
commit 4ac5def38a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaultenv/bin/boot
View File

@ -74,7 +74,7 @@ if [ ! -e /dev/ram0.kernel ]; then
addpart /dev/ram0 8M@8M(kernel)
fi
if [ x$kernel_loc = xnfs ] || [ x$kernel_loc = xtftp ]; then
if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
if [ x$ip = xdhcp ]; then
dhcp
fi

8
defaultenv/bin/update
View File

@ -32,12 +32,12 @@ elif [ x${type} = xrootfs ]; then
type=root
elif [ x${type} = xbarebox ]; then
image=$bareboximage
if [ x${image} = x ]; then
if [ -z ${image} ]; then
image=barebox.bin
fi
elif [ x${type} = xbareboxenv ]; then
image=$bareboxenvimage
if [ x${image} = x ]; then
if [ -z ${image} ]; then
image=bareboxenv.bin
fi
elif [ x${type} = xxload ]; then
@ -47,7 +47,7 @@ else
exit 1
fi
if [ x${imagename} != x ]; then
if [ -n ${imagename} ]; then
image=${imagename}
fi
@ -60,7 +60,7 @@ else
exit 1
fi
if [ x${mode} != xtftp ] && [ x${mode} != xxmodem ] ; then
if [ x${mode} != xtftp -a x${mode} != xxmodem ] ; then
echo "unsupported mode ${mode}."
. /env/bin/_update_help
exit 1