From 64020ec169f2841b6f4ae01eb3769b77b462e9e1 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jlu@pengutronix.de>
Date: Sat, 20 Oct 2012 15:45:23 +0200
Subject: [PATCH] update env

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/boards/beaglebone/env/boot/sd      |    8 ++------
 arch/arm/boards/beaglebone/env/init/general |    5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boards/beaglebone/env/boot/sd b/arch/arm/boards/beaglebone/env/boot/sd
index f3f276c..898a9fb 100644
--- a/arch/arm/boards/beaglebone/env/boot/sd
+++ b/arch/arm/boards/beaglebone/env/boot/sd
@@ -6,11 +6,7 @@ if [ "$1" = menu ]; then
 fi
 
 global.bootm.image=/boot/uImage
-#global.bootm.oftree=<path to oftree>
+global.bootm.oftree=/boot/oftree
 #global.bootm.initrd=<path to initrd>
 
-#bootargs-root-nfs -n "<path on server>" -s <serverip>
-#bootargs-root-jffs2 -m <mtdname>
-#bootargs-root-ubi -r <volume> -m <mtdname>
-
-global.linux.bootargs.root="root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro"
+bootargs-root-disk -p mmcblk0p2 -t ext4
diff --git a/arch/arm/boards/beaglebone/env/init/general b/arch/arm/boards/beaglebone/env/init/general
index bbd7ee3..4ade9cd 100644
--- a/arch/arm/boards/beaglebone/env/init/general
+++ b/arch/arm/boards/beaglebone/env/init/general
@@ -6,13 +6,10 @@ if [ "$1" = menu ]; then
 fi
 
 # user (used for network filenames)
-global.user=jlu
+#global.user=none
 
 # timeout in seconds before the default boot entry is started
 global.autoboot_timeout=3
 
 # default boot entry (one of /env/boot/*)
 global.boot.default=sd
-
-# default tftp path
-global.tftp.path=/mnt/tftp-dhcp