Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

11 files changed, 58 insertions, 1 deletions

diff --git a/recipes/angstrom/angstrom-led-config.bb b/recipes/angstrom/angstrom-led-config.bb
index a0373edae3..2213a76234 100644
--- a/recipes/angstrom/angstrom-led-config.bb
+++ b/recipes/angstrom/angstrom-led-config.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for runtime LED configuration" 
 
 #PV = "${DISTRO_VERSION}"
-PR = "r7"
+PR = "r8"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
diff --git a/recipes/angstrom/angstrom-led-config/ts72xx/leds b/recipes/angstrom/angstrom-led-config/ts72xx/leds
new file mode 100644
index 0000000000..03fedd8fe2
--- /dev/null
+++ b/recipes/angstrom/angstrom-led-config/ts72xx/leds
@@ -0,0 +1,3 @@
+#file format: name trigger
+platform:grled nand-disk
+platform:rdled heartbeat
diff --git a/recipes/angstrom/angstrom-uboot-scripts/720p.cmd b/recipes/angstrom/angstrom-uboot-scripts/720p.cmd
new file mode 100644
index 0000000000..d1c40b7736
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/720p.cmd
@@ -0,0 +1,4 @@
+setenv vram '16M'
+setenv dvimode 'hd720 omapfb.vram=0:8M,1:4M,2:4M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/720p16-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/720p16-dsplink.cmd
new file mode 100644
index 0000000000..21c1902dc6
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/720p16-dsplink.cmd
@@ -0,0 +1,4 @@
+setenv vram '16M'
+setenv dvimode 'hd720-16 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/720p16bpp.cmd b/recipes/angstrom/angstrom-uboot-scripts/720p16bpp.cmd
new file mode 100644
index 0000000000..33f678c8a9
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/720p16bpp.cmd
@@ -0,0 +1,4 @@
+setenv vram '16M'
+setenv dvimode 'hd720-16 omapfb.vram=0:8M,1:4M,2:4M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/default-env.cmd b/recipes/angstrom/angstrom-uboot-scripts/default-env.cmd
new file mode 100644
index 0000000000..e9a06c6a46
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/default-env.cmd
@@ -0,0 +1,19 @@
+setenv bootdelay 1
+setenv loadaddr 0x82000000
+setenv dvimode 'hd720'
+setenv vram '12M'
+setenv mem 'mem=99M@0x80000000 mem=128M@0x88000000'
+setenv defaultdisplay 'dvi'
+setenv loadbootscript 'fatload mmc 0 ${loadaddr} boot.scr'
+setenv bootscript 'echo Running bootscript from mmc ...; source ${loadaddr}'
+setenv loaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcroot '/dev/mmcblk0p2 rw'
+setenv mmcrootfstype 'ext3 rootwait
+setenv mmcargs 'setenv bootargs console=${console} vram=${vram} omapfb.mode=dvi:${dvimode} omapdss.def_disp=${defaultdisplay} root=${mmcroot} rootfstype=${mmcrootfstype} ${mem}'
+setenv mmcboot 'echo Booting from mmc ...; run mmcargs; bootm ${loadaddr}'
+setenv nandroot '/dev/mtdblock4 rw'
+setenv nandargs 'setenv bootargs console=${console} vram=${vram} omapfb.mode=dvi:${dvimode} omapfb.debug=y omapdss.def_disp=${defaultdisplay} root=${nandroot} rootfstype=${nandrootfstype}'
+setenv nandboot 'echo Booting from nand ...; run nandargs; nand read ${loadaddr} 280000 400000; bootm ${loadaddr}'
+setenv bootcmd 'if mmc init; then if run loadbootscript; then run bootscript; else if run loaduimage; then run mmcboot; else run nandboot; fi; fi; else run nandboot; if'
+saveenv
+boot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd
new file mode 100644
index 0000000000..b182bee9a2
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd
@@ -0,0 +1,4 @@
+setenv vram '12M'
+setenv defaultdisplay 'lcd43 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:2M,2:2M' 
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd
new file mode 100644
index 0000000000..da6ea75f89
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd
@@ -0,0 +1,3 @@
+setenv dvimode '640x480MR-24@60 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:6M,1:3M,2:3M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook-512MB.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook-512MB.cmd
new file mode 100644
index 0000000000..9751e8153e
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook-512MB.cmd
@@ -0,0 +1,4 @@
+mmcinit
+fatload mmc 0 0x82000000 uImage
+setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=99M@0x80000000 mem=384M@0x88000000 vram=32M omapfb.vram=0:16M,1:8M,2:8M'
+bootm
diff --git a/recipes/angstrom/omap3-mkcard.bb b/recipes/angstrom/omap3-mkcard.bb
new file mode 100644
index 0000000000..c7a1a3e04b
--- /dev/null
+++ b/recipes/angstrom/omap3-mkcard.bb
@@ -0,0 +1,11 @@
+DESCRIPTION="Format a card for omap3 booting"
+SRC_URI = "file://omap3-mkcard.sh"
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 755 ${WORKDIR}/omap3-mkcard.sh ${D}${bindir}/
+}
+
+PACKAGE_ARCH_${PN} = "all"
+RDEPENDS_${PN} = "bc dosfstools e2fsprogs-mke2fs util-linux-ng util-linux-ng-sfdisk"
+
diff --git a/recipes/angstrom/omap3-mkcard/omap3-mkcard.sh b/recipes/angstrom/omap3-mkcard/omap3-mkcard.sh
new file mode 120000
index 0000000000..b8c8a708a1
--- /dev/null
+++ b/recipes/angstrom/omap3-mkcard/omap3-mkcard.sh
@@ -0,0 +1 @@
+../../../contrib/angstrom/omap3-mkcard.sh
\ No newline at end of file