From 9eab7a12e4a94efbb53e5e43beeb67d15ae9eab5 Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Mon, 9 Aug 2010 08:52:18 +0000
Subject: angstrom-uboot-scripts: debugged beagleboard validation boot/user
 scripts

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 recipes/angstrom/angstrom-uboot-scripts.bb                |  2 +-
 .../beagleboard-validation-boot.cmd                       | 15 +++++++--------
 .../beagleboard-validation-user.cmd                       | 15 +++++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'recipes/angstrom')

diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index 2152f5df5f..a478cb2333 100644
--- a/recipes/angstrom/angstrom-uboot-scripts.bb
+++ b/recipes/angstrom/angstrom-uboot-scripts.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Various uboot scripts"
 
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "u-boot-mkimage-native"
 
diff --git a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-boot.cmd b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-boot.cmd
index 50a82a6c2e..71d314c526 100644
--- a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-boot.cmd
+++ b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-boot.cmd
@@ -1,14 +1,13 @@
-setenv dvimode 'hd720'
-setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+# On xM: bootargs=console=ttyS2,115200n8 mem=80M@0x80000000 mem=384M@0x88000000 mpurate=1000 buddy=none camera=lbcm3m1 vram=16M omapfb.vram=0:8M,1:4M,2:4M omapfb.mode=dvi:hd720 omapdss.def_disp=dvi root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait
+mmc init
+setenv dvimode hd720
+setenv vram 16M omapfb.vram=0:8M,1:4M,2:4M
 if test "${beaglerev}" = "AxBx"; then
-setenv mpurate 600
-setenv optargs 'mem=80M@0x80000000 musb_hdrc.fifomode=5'
+setenv optargs mem=80M@0x80000000 musb_hdrc.fifomode=5
 elif test "${beaglerev}" = "Cx"; then
-setenv mpurate 720
-setenv optargs 'mem=80M@0x80000000 mem=128M@0x88000000 musb_hdrc.fifomode=5'
+setenv optargs mem=80M@0x80000000 mem=128M@0x88000000 musb_hdrc.fifomode=5
 else
-setenv mpurate 1000
-setenv optargs 'mem=80M@0x80000000 mem=384M@0x88000000'
+setenv optargs mem=80M@0x80000000 mem=384M@0x88000000
 fi
 run loaduimage
 run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd
index 6488db40db..7dbf69b548 100644
--- a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd
+++ b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd
@@ -1,15 +1,14 @@
-setenv console 'ttyS2,115200n8 console=tty0'
+mmc init
+setenv rdaddr 0x81000000
+setenv ramroot /dev/ram0
 if test "${beaglerev}" = "AxBx"; then
-setenv mpurate 600
-setenv optargs 'mem=80M@0x80000000 musb_hdrc.fifomode=5'
+setenv optargs mem=80M@0x80000000 musb_hdrc.fifomode=5
 elif test "${beaglerev}" = "Cx"; then
-setenv mpurate 720
-setenv optargs 'mem=80M@0x80000000 mem=128M@0x88000000 musb_hdrc.fifomode=5'
+setenv optargs mem=80M@0x80000000 mem=128M@0x88000000 musb_hdrc.fifomode=5
 else
-setenv mpurate 1000
-setenv optargs 'mem=99M@0x80000000 mem=384M@0x88000000'
+setenv optargs mem=80M@0x80000000 mem=384M@0x88000000
 fi
-run loaduimage
 run loadramdisk
+run loaduimage
 run ramboot
 
-- 
cgit 1.2.3-korg