mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] defaultenv: add dhcp-barebox option
Date: Tue, 13 Mar 2012 18:45:07 +0100	[thread overview]
Message-ID: <1331660707-9518-2-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1331660707-9518-1-git-send-email-plagnioj@jcrosoft.com>

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

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv/bin/_boot_help |    8 +++++++-
 defaultenv/bin/boot       |    5 ++++-
 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"
-- 
1.7.7


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2012-03-13 17:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-13 17:45 [PATCH 1/2] defaultenv: add bootp support Jean-Christophe PLAGNIOL-VILLARD
2012-03-13 17:45 ` Jean-Christophe PLAGNIOL-VILLARD [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331660707-9518-2-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox