4 files changed, 18 insertions, 10 deletions
diff --git a/recipes/angstrom/angstrom-gdm-autologin-hack.bb b/recipes/angstrom/angstrom-gdm-autologin-hack.bb
index 5c5d7e8172..c110af2ce5 100644
--- a/recipes/angstrom/angstrom-gdm-autologin-hack.bb
+++ b/recipes/angstrom/angstrom-gdm-autologin-hack.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "Append Autologin to GDM config (custom.conf)"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 ALLOW_EMPTY_${PN} = "1"
@@ -7,7 +8,7 @@ pkg_postinst_${PN}() {
 #!/bin/sh
 grep "TimedLogin" $D/etc/gdm/custom.conf
 if [ $? -eq 0 ]; then
-   echo "NOTE:: custom.conf already has 'TimedLogin' configured - not patching
+    echo "NOTE:: custom.conf already has 'TimedLogin' configured - not patching"
 else
     cat >> $D/etc/gdm/custom.conf <<EOF
 
diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index 020a7afd8d..497bd7919d 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 0c002524bf..e286e003bb 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@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@0x88000000'
-if "${beaglerev}" = "AxBx"; then
- setenv memmap 'mem=80M'
-fi
-if "${beaglerev}" = "Cx"; then
- setenv memmap 'mem=80M mem=128M@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@0x88000000'
+#fi
+
 setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
 setenv defaultdisplay 'dvi'
 setenv dvimode 'hd720'
 #setenv dvimode '1280x720MR-32@60'
 
+#setenv camera 'lbcm3m1'
+setenv camera 'lbcmvga'
+
 run mmcargs
 printenv
 run mmcboot
diff --git a/recipes/angstrom/exquisite-theme-angstrom.bb b/recipes/angstrom/exquisite-theme-angstrom.bb
index 38511c3e52..5c17b311ff 100644
--- a/recipes/angstrom/exquisite-theme-angstrom.bb
+++ b/recipes/angstrom/exquisite-theme-angstrom.bb
@@ -6,7 +6,7 @@ SECTION = "x11"
 DEPENDS = "edje-native"
 RRECOMMENDS_${PN} = "exquisite"
 
-PV = "1.1"
+PV = "1.2"
 
 inherit update-alternatives