9
0
Fork 0

defaultenv: add dhcp-barebox option

barebox will use DHCP and pass the result to the kernel
update the help

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-03-13 18:45:07 +01:00 committed by Sascha Hauer
parent 3374ddcc45
commit 5b0ffe91c4
2 changed files with 11 additions and 2 deletions

View File

@ -5,7 +5,7 @@ echo ""
echo "options"
echo " - kernel nand, nor, nfs, tftp, disk"
echo " - rootfs nand, nor, net, disk"
echo " - ip dhcp, none, empty"
echo " - ip dhcp, dhcp-barebox none, empty"
echo ""
echo "mode option"
echo " mode kernel rootfs"
@ -15,4 +15,10 @@ echo " nfs nfs net"
echo " tftp fttp net"
echo " disk disk disk"
echo ""
echo "ip option"
echo " dhcp barebox and kernel will use DHCP"
echo " dhcp-barebox barebox will use DHCP and pass the result to the kernel"
echo " none do not pass ip parameter to the kernel and set it to none"
echo " empty pass ip parameter to the kernel"
echo ""
echo "default mode are used from the /env/config"

View File

@ -39,7 +39,7 @@ elif [ x$mode = xdisk ]; then
kernel_loc=disk
fi
if [ x$ip = xdhcp ]; then
if [ x$ip = xdhcp -o x$ip = "xdhcp-barebox" ]; then
if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
dhcp
if [ x$rootpath != x ]; then
@ -49,6 +49,9 @@ if [ x$ip = xdhcp ]; then
kernelimage=$bootfile
fi
fi
fi
if [ x$ip = xdhcp -o ]; then
bootargs="$bootargs ip=dhcp"
elif [ x$ip = xnone ]; then
bootargs="$bootargs ip=none"