[PATCH] ARM: boards: Fix beaglebone enviroment

[Daniel Schultz]

This patch adds missing enviroment files to boot from different sources.
Also adds the handling of default bootsources.

Signed-off-by: Daniel Schultz <d.schultz at phytec.de>
---
 .../arm/boards/beaglebone/defaultenv-beaglebone/boot/emmc |  6 ++++++
 arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/mmc |  6 ++++++
 arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/net | 15 +++++++++++++++
 .../beaglebone/defaultenv-beaglebone/init/bootsource      | 13 +++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/emmc
 create mode 100644 arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/mmc
 create mode 100644 arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/net
 create mode 100644 arch/arm/boards/beaglebone/defaultenv-beaglebone/init/bootsource

diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/emmc b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/emmc
new file mode 100644
index 0000000..cc2bea2
--- /dev/null
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/emmc
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mount /dev/mmc1.0 /mnt/
+global.bootm.image=/mnt/linuximage
+global.bootm.oftree=/mnt/oftree
+global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2 rootwait rw"
diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/mmc b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/mmc
new file mode 100644
index 0000000..96255d5
--- /dev/null
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/mmc
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mount /dev/mmc0.0 /mnt/
+global.bootm.image=/mnt/linuximage
+global.bootm.oftree=/mnt/oftree
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw"
diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/net b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/net
new file mode 100644
index 0000000..5ca4bad
--- /dev/null
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/net
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+path="/mnt/tftp"
+
+global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
+
+oftree="${path}/${global.user}-oftree-${global.hostname}"
+if [ -f "${oftree}" ]; then
+        global.bootm.oftree="$oftree"
+fi
+
+nfsroot="/nfsroot/${global.hostname}"
+bootargs-ip
+/env/config-expansions
+global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,vers=3,udp rw"
diff --git a/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/bootsource b/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/bootsource
new file mode 100644
index 0000000..c36d723
--- /dev/null
+++ b/arch/arm/boards/beaglebone/defaultenv-beaglebone/init/bootsource
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -n "$nv.boot.default" ]; then
+	exit
+fi
+
+if [ $bootsource = mmc -a $bootsource_instance = 1 ]; then
+	global.boot.default="emmc mmc net"
+elif [ $bootsource = mmc -a $bootsource_instance = 0 ]; then
+	global.boot.default="mmc emmc net"
+elif [ $bootsource = net ]; then
+	global.boot.default="net emmc mmc"
+fi
-- 
1.9.1