From 9cd504dd2035d116b7278479ebd0c6e35397e710 Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Mon, 7 Jun 2010 01:20:40 -0500
Subject: angstrom-uboot-scripts: Added various resolutions

Also added a ramdisk configuration with mem= statements.
---
 recipes/angstrom/angstrom-uboot-scripts.bb         |  2 +-
 .../angstrom/angstrom-uboot-scripts/esc-sxga.cmd   |  4 ---
 .../angstrom-uboot-scripts/linuxtagdemo-sxga.cmd   | 42 ++++++++++++++++++++++
 .../angstrom-uboot-scripts/linuxtagdemo-vga.cmd    | 42 ++++++++++++++++++++++
 .../angstrom-uboot-scripts/linuxtagdemo-xga.cmd    | 42 ++++++++++++++++++++++
 .../angstrom-uboot-scripts/ramdisk-dsplink.cmd     |  4 +++
 6 files changed, 131 insertions(+), 5 deletions(-)
 delete mode 100644 recipes/angstrom/angstrom-uboot-scripts/esc-sxga.cmd
 create mode 100644 recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-sxga.cmd
 create mode 100644 recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-vga.cmd
 create mode 100644 recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-xga.cmd
 create mode 100644 recipes/angstrom/angstrom-uboot-scripts/ramdisk-dsplink.cmd

(limited to 'recipes/angstrom')

diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index 78a89fa234..56c0475600 100644
--- a/recipes/angstrom/angstrom-uboot-scripts.bb
+++ b/recipes/angstrom/angstrom-uboot-scripts.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Various uboot scripts"
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "u-boot-mkimage-native"
 
diff --git a/recipes/angstrom/angstrom-uboot-scripts/esc-sxga.cmd b/recipes/angstrom/angstrom-uboot-scripts/esc-sxga.cmd
deleted file mode 100644
index 7a50ad5d63..0000000000
--- a/recipes/angstrom/angstrom-uboot-scripts/esc-sxga.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-setenv bootargs 'console=tty0 console=ttyS2,115200n8 mpurate=1000 nohz=off vram=16M omapfb.mode=dvi:1280x1024MR-24@60 omapdss.def_disp=dvi omapfb.vram=0:8M,1:4M,2:4M root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait mem=99M@0x80000000 mem=384M@0x88000000'
-fatload mmc 0 0x82000000 uImage
-bootm 0x82000000
-EOF
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-sxga.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-sxga.cmd
new file mode 100644
index 0000000000..3ac74d90d0
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-sxga.cmd
@@ -0,0 +1,42 @@
+#setenv usbtty 'cdc_acm'
+#setenv mpurate '500'
+#setenv buddy 'none'
+
+#setenv vram '12M'
+#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}'
+
+setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
+setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
+setenv nandloaduimage 'nand read ${loadaddr} 280000 400000'
+setenv nandboot 'run nandloadimage; bootm ${loadaddr}'
+
+setenv mmcroot 'root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait'
+setenv mmcargs 'run setbase; setenv bootargs ${baseargs} ${mmcroot}'
+setenv mmcloaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcboot 'run mmcloaduimage; bootm ${loadaddr}'
+
+echo Setting Specific Environment from MMC boot.scr
+
+# set musb to only use 8k for fifo memory - not necesary on xm, but safe anyway
+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
+setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+setenv defaultdisplay 'dvi'
+setenv dvimode '1280x1024MR-32@60'
+
+run mmcargs
+printenv
+run mmcboot
+
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-vga.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-vga.cmd
new file mode 100644
index 0000000000..c380107def
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-vga.cmd
@@ -0,0 +1,42 @@
+#setenv usbtty 'cdc_acm'
+#setenv mpurate '500'
+#setenv buddy 'none'
+
+#setenv vram '12M'
+#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}'
+
+setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
+setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
+setenv nandloaduimage 'nand read ${loadaddr} 280000 400000'
+setenv nandboot 'run nandloadimage; bootm ${loadaddr}'
+
+setenv mmcroot 'root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait'
+setenv mmcargs 'run setbase; setenv bootargs ${baseargs} ${mmcroot}'
+setenv mmcloaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcboot 'run mmcloaduimage; bootm ${loadaddr}'
+
+echo Setting Specific Environment from MMC boot.scr
+
+# set musb to only use 8k for fifo memory - not necesary on xm, but safe anyway
+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
+setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+setenv defaultdisplay 'dvi'
+setenv dvimode '640x480-32@60'
+
+run mmcargs
+printenv
+run mmcboot
+
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-xga.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-xga.cmd
new file mode 100644
index 0000000000..1d9913a713
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-xga.cmd
@@ -0,0 +1,42 @@
+#setenv usbtty 'cdc_acm'
+#setenv mpurate '500'
+#setenv buddy 'none'
+
+#setenv vram '12M'
+#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}'
+
+setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
+setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
+setenv nandloaduimage 'nand read ${loadaddr} 280000 400000'
+setenv nandboot 'run nandloadimage; bootm ${loadaddr}'
+
+setenv mmcroot 'root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait'
+setenv mmcargs 'run setbase; setenv bootargs ${baseargs} ${mmcroot}'
+setenv mmcloaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcboot 'run mmcloaduimage; bootm ${loadaddr}'
+
+echo Setting Specific Environment from MMC boot.scr
+
+# set musb to only use 8k for fifo memory - not necesary on xm, but safe anyway
+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
+setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+setenv defaultdisplay 'dvi'
+setenv dvimode '1024x768MR-32@60'
+
+run mmcargs
+printenv
+run mmcboot
+
diff --git a/recipes/angstrom/angstrom-uboot-scripts/ramdisk-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/ramdisk-dsplink.cmd
new file mode 100644
index 0000000000..42bf99798a
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/ramdisk-dsplink.cmd
@@ -0,0 +1,4 @@
+setenv bootargs 'console=tty0 console=ttyS2,115200n8 mpurate=1000 nohz=off vram=16M omapfb.mode=dvi:640x480MR-16@60 omapdss.def_disp=dvi omapfb.vram=0:8M,1:4M,2:4M root=/dev/ram0 rw rootfstype=ext2 initrd=0x81600000,32M ramdisk_size=32768 mem=99M@0x80000000 mem=384M@0x88000000'
+fatload mmc 0 0x80200000 uImage
+fatload mmc 0 0x81600000 ramdisk.gz
+bootm 0x80200000
-- 
cgit 1.2.3-korg