[oe-commits] Roger Monk : angstrom-uboot-scripts: tweak linuxtagdemo image boot script

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 60b39e1164398d02695f7aee6ae5a97bb855f26b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=60b39e1164398d02695f7aee6ae5a97bb855f26b

Author: Roger Monk <r-monk at ti.com>
Date:   Wed Sep  8 16:44:37 2010 +0100

angstrom-uboot-scripts: tweak linuxtagdemo image boot script

   * Remove beagle detection (until fixed)
   * Pass camera variable on linux cmdline for LI vga camera
   * Remove usb fifo fix variable (not needed for later boards and helps reduce bootargs line length)
   * Bump PR

Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <k-kooi at ti.com>

---

 recipes/angstrom/angstrom-uboot-scripts.bb         |    2 +-
 .../angstrom-uboot-scripts/linuxtagdemo.cmd        |   21 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index 020a7af..497bd79 100644
--- a/recipes/angstrom/angstrom-uboot-scripts.bb
+++ b/recipes/angstrom/angstrom-uboot-scripts.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Various uboot scripts"
 
-PR = "r10"
+PR = "r11"
 
 DEPENDS = "u-boot-mkimage-native"
 
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd
index 0c00252..e286e00 100644
--- a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd
@@ -6,7 +6,8 @@
 #setenv defaultdisplay 'dvi'
 #setenv dvimode '640x480MR-16 at 60'
 
-setenv setbase 'setenv baseargs ${memmap} console=${console} mpurate=${mpurate} buddy=${buddy} vram=${vram} musb_hdrc.fifomode=${musbfifomode} omapfb.mode=${defaultdisplay}:${dvimode} omapdss.def_disp=${defaultdisplay}'
+# temp removing musb config since out of args space... musb_hdrc.fifomode=${musbfifomode}
+setenv setbase 'setenv baseargs ${memmap} console=${console} mpurate=${mpurate} buddy=${buddy} camera=${camera} vram=${vram} omapfb.mode=${defaultdisplay}:${dvimode} omapdss.def_disp=${defaultdisplay}'
 
 setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
 setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
@@ -26,17 +27,23 @@ setenv musbfifomode '5'
 # mpurate is read from omap registers on omap3530 (which x-load has set to 600mhz?), on xm, uboot sets this to 1GHz
 #setenv mpurate '720'  
 setenv memmap 'mem=80M mem=384M at 0x88000000'
-if "${beaglerev}" = "AxBx"; then
- setenv memmap 'mem=80M'
-fi
-if "${beaglerev}" = "Cx"; then
- setenv memmap 'mem=80M mem=128M at 0x88000000'
-fi
+
+# temp remove board check until uboot fixed
+#if "${beaglerev}" = "AxBx"; then
+# setenv memmap 'mem=80M'
+#fi
+#if "${beaglerev}" = "Cx"; then
+# setenv memmap 'mem=80M mem=128M at 0x88000000'
+#fi
+
 setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
 setenv defaultdisplay 'dvi'
 setenv dvimode 'hd720'
 #setenv dvimode '1280x720MR-32 at 60'
 
+#setenv camera 'lbcm3m1'
+setenv camera 'lbcmvga'
+
 run mmcargs
 printenv
 run mmcboot