mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Wolfram Sang <w.sang@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/11] defaultenv: boot: add support to boot from disk
Date: Sun, 25 Sep 2011 22:54:08 +0200	[thread overview]
Message-ID: <1316984054-31295-6-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1316984054-31295-1-git-send-email-w.sang@pengutronix.de>

From: Marc Kleine-Budde <mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 defaultenv/bin/boot |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 4284308..652ae0c 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -18,6 +18,9 @@ elif [ x$1 = xnfs ]; then
 elif [ x$1 = xtftp ]; then
 	rootfs_loc=net
 	kernel_loc=tftp
+elif [ x$1 = xdisk ]; then
+	rootfs_loc=disk
+	kernel_loc=disk
 fi
 
 if [ x$ip = xdhcp ]; then
@@ -31,6 +34,8 @@ fi
 
 if [ x$rootfs_loc = xnet ]; then
 	bootargs="$bootargs root=/dev/nfs nfsroot=$nfsroot,v3,tcp noinitrd"
+elif [ x$rootfs_loc = xdisk ]; then
+	bootargs="$bootargs root=/dev/$rootfs_part_linux_dev rootfstype=$rootfs_type noinitrd rootwait"
 elif [ x$rootfs_loc = xinitrd ]; then
 	bootargs="$bootargs root=/dev/ram0 rdinit=/sbin/init"
 else
@@ -100,8 +105,10 @@ elif [ x$kernel_loc = xnor ]; then
 	kdev="/dev/nor0.kernel"
 elif [ x$kernel_loc = xnand ]; then
 	kdev="/dev/nand0.kernel.bb"
+elif [ x$kernel_loc = xdisk ]; then
+	kdev="/dev/$kernel_part"
 else
-	echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'nor'"
+	echo "error: set kernel_loc to one of 'tftp', 'nfs', 'nand', 'nor' or 'disk'"
 	exit 1
 fi
 
-- 
1.7.5.4


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

  parent reply	other threads:[~2011-09-25 20:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-25 20:54 [PATCH 00/11] improvements for net & disk booting Wolfram Sang
2011-09-25 20:54 ` [PATCH 01/11] defaultenv: simplify scripting Wolfram Sang
2011-09-25 20:54 ` [PATCH 02/11] defaultenv: boot: add backwards compatibility for kernel_loc=net Wolfram Sang
2011-09-25 20:54 ` [PATCH 03/11] defaultenv: boot: add eth0 to ip configuration Wolfram Sang
2011-09-25 20:54 ` [PATCH 04/11] defaultenv: boot: add serverip to static " Wolfram Sang
2011-09-25 20:54 ` Wolfram Sang [this message]
2011-09-25 20:54 ` [PATCH 06/11] defaultenv: update: add support to update kernel on disk Wolfram Sang
2011-09-25 20:54 ` [PATCH 07/11] defaultenv: add config template Wolfram Sang
2011-09-25 20:54 ` [PATCH 08/11] net: string_to_ip: add sanity check for > 255 Wolfram Sang
2011-09-25 20:54 ` [PATCH 09/11] net: getenv_ip: check return value of string_to_ip Wolfram Sang
2011-09-25 20:54 ` [PATCH 10/11] defaultenv: place eth0.ethaddr more visibly Wolfram Sang
2011-09-25 20:54 ` [PATCH 11/11] net: dhcp: introduce global serverip variable Wolfram Sang
2011-09-26  9:57   ` Sascha Hauer

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=1316984054-31295-6-git-send-email-w.sang@pengutronix.de \
    --to=w.sang@pengutronix.de \
    --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