diff options
| -rw-r--r-- | defaultenv/bin/_boot_help | 8 | ||||
| -rw-r--r-- | defaultenv/bin/boot | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/defaultenv/bin/_boot_help b/defaultenv/bin/_boot_help index e7f7f16f1f..7c964441b8 100644 --- a/defaultenv/bin/_boot_help +++ b/defaultenv/bin/_boot_help @@ -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" diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot index 1566c6a7d7..ba04373049 100644 --- a/defaultenv/bin/boot +++ b/defaultenv/bin/boot @@ -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" |