[PATCH 1/2] defaultenv-2: Fix verbose booting

[PATCH 1/2] defaultenv-2: Fix verbose booting

[Sascha Hauer]

During option parsing we use the variable BOOT_BOOTMOPTS, all other
scripts use BOOT_BOOTM_OPTS though. Fix this by using the same variable
everywhere.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 defaultenv-2/base/bin/boot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultenv-2/base/bin/boot b/defaultenv-2/base/bin/boot
index f7f460e..eed4b3c 100644
--- a/defaultenv-2/base/bin/boot
+++ b/defaultenv-2/base/bin/boot
@@ -17,7 +17,7 @@ $0 [OPTIONS] [source]\n
 
 while getopt "vdhl" opt; do
 	if [ ${opt} = v ]; then
-		BOOT_BOOTMOPTS="$BOOT_BOOTMOPTS -v"
+		BOOT_BOOTM_OPTS="$BOOT_BOOTM_OPTS -v"
 		BOOT_VERBOSE=1
 	elif [ ${opt} = d ]; then
 		BOOT_DRYRUN=1
-- 
1.8.2.rc2


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

[PATCH 2/2] defaultenv-2: net: use oftree when existing

[Sascha Hauer]

For booting with devicetree we had to adjust /env/boot/net manually.
Instead, test if a devicetree exists and if yes, use it. This makes
for a better default.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 defaultenv-2/base/boot/net | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net
index 90c25aa..05bb728 100644
--- a/defaultenv-2/base/boot/net
+++ b/defaultenv-2/base/boot/net
@@ -8,7 +8,12 @@ fi
 path="/mnt/tftp"
 
 global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
-#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}"
+
+oftree="${path}/${global.user}-oftree-${global.hostname}"
+if [ -f "${oftree}" ]; then
+	global.bootm.oftree="$oftree"
+fi
+
 nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
 bootargs-ip
 global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
-- 
1.8.2.rc2


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