summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-03-13 18:45:07 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-03-17 17:20:18 +0100
commit5b0ffe91c46a9015d83d6bd26a9d7329a13f86fb (patch)
treef30086bc3698752eaf8fa933e1c010568f32cdae /defaultenv
parent3374ddcc4538f986edd4f04efcf23bf0ccef80c0 (diff)
downloadbarebox-5b0ffe91c46a9015d83d6bd26a9d7329a13f86fb.tar.gz
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>
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/_boot_help8
-rw-r--r--defaultenv/bin/boot5
2 files changed, 11 insertions, 2 deletions
diff --git a/defaultenv/bin/_boot_help b/defaultenv/bin/_boot_help
index e7f7f16..7c96444 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 1566c6a..ba04373 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"