From: Marc Kleine-Budde <mkl@pengutronix.de>
To: sha@pengutronix.de
Cc: barebox@lists.infradead.org
Subject: [PATCH 2/7] defaultenv: boot: add backwards compatibility for kernel_loc=net
Date: Fri, 8 Apr 2011 12:19:03 +0200 [thread overview]
Message-ID: <1302257948-18174-3-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1302257948-18174-1-git-send-email-mkl@pengutronix.de>
Since commit 9eac282024c55fc13970189d6ace61f884917538, the boot script
doesn't understand kernel_loc=net anymore. This patch adds backwards
compatibility so that the kernel is loaded from tftp as before.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
defaultenv/bin/boot | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index c97a396..6649c57 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -2,6 +2,10 @@
. /env/config
+if [ x$kernel_loc = xnet ]; then
+ kernel_loc=tftp
+fi
+
if [ x$1 = xnand ]; then
rootfs_loc=nand
kernel_loc=nand
--
1.7.4.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-04-08 10:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 10:19 [PATCH 0/7] defaultenv updates Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 1/7] defaultenv: simplify scripting Marc Kleine-Budde
2011-04-08 10:42 ` Sascha Hauer
2011-04-08 10:49 ` Marc Kleine-Budde
2011-04-08 10:19 ` Marc Kleine-Budde [this message]
2011-04-08 13:32 ` [PATCH 2/7] defaultenv: boot: add backwards compatibility for kernel_loc=net Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 13:59 ` Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 3/7] defaultenv: boot: add eth0 to ip configuration Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 4/7] defaultenv: boot: add serverip to static " Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 5/7] defaultenv: boot: add support to boot from disk Marc Kleine-Budde
2011-04-08 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 10:19 ` [PATCH 6/7] defaultenv: update: add support to update kernel on disk Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 7/7] defaultenv: add config template Marc Kleine-Budde
2011-04-08 13:41 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 13:59 ` Marc Kleine-Budde
2011-04-08 10:26 ` [PATCH 0/7] defaultenv updates Marc Kleine-Budde
2011-04-08 11:08 ` [PATCH 1/7 v2] defaultenv: simplify scripting Marc Kleine-Budde
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=1302257948-18174-3-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=sha@pengutronix.de \
/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