From: David-John Willis <John.Willis@Distant-earth.com>
Date: Mon, 14 Dec 2009 11:42:24 +0000 (+0000)
Subject: pandora-uboot-scripts: Update u-boot boot scripts and recipe.
X-Git-Tag: Release-2010-05/1~138
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=3fed586e5808f184f8aba24ddd669a5b71719c65

pandora-uboot-scripts: Update u-boot boot scripts and recipe.
---

diff --git a/recipes/pandora-system/pandora-uboot-scripts.bb b/recipes/pandora-system/pandora-uboot-scripts.bb
index 17467fd..59b1cce 100644
--- a/recipes/pandora-system/pandora-uboot-scripts.bb
+++ b/recipes/pandora-system/pandora-uboot-scripts.bb
@@ -2,14 +2,16 @@ DESCRIPTION = "Helper uboot boot scripts for the OpenPandora"
 
 DEPENDS = "u-boot-mkimage-native"
 
-SRC_URI = "file://*.cmd"
+SRC_URI = "file://boot*"
+
+PR = "r1"
 
 do_configure() {
-	cp ${WORKDIR}/*.cmd ${S}
+	cp ${WORKDIR}/boot* ${S}
 }
 
 do_compile() {
-	for i in *.cmd ; do
+	for i in boot* ; do
 		uboot-mkimage -A ${TARGET_ARCH} -O linux -T script -C none -a 0 -e 0 -n "OpenPandora $i" -d $i $i.scr
 	done
 }
diff --git a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2 b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2
new file mode 100644
index 0000000..cde3cc1
--- /dev/null
+++ b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2
@@ -0,0 +1,2 @@
+setenv bootargs debug root=/dev/mmcblk0p2 rw rootdelay=2 console=ttyS0,115200n8 vram=6272K omapfb.vram=0:3000K
+fatload mmc 0 0x80300000 uImage; bootm 0x80300000
diff --git a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2-ext3.cmd b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2-ext3.cmd
deleted file mode 100644
index 9717c09..0000000
--- a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk0p2-ext3.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv bootargs debug root=/dev/mmcblk0p2 console=ttyS0,115200n8 rootdelay=2 rootfstype=ext3 ro vram=6272K omapfb.vram=0:1500K
-fatload mmc 0 0x80300000 uImage; bootm 0x80300000
diff --git a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1 b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1
new file mode 100644
index 0000000..72d22df
--- /dev/null
+++ b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1
@@ -0,0 +1,2 @@
+setenv bootargs debug root=/dev/mmcblk1p1 rw rootdelay=2 console=ttyS0,115200n8 vram=6272K omapfb.vram=0:3000K
+fatload mmc 0 0x80300000 uImage; bootm 0x80300000
diff --git a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1-ext3.cmd b/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1-ext3.cmd
deleted file mode 100644
index 8118c90..0000000
--- a/recipes/pandora-system/pandora-uboot-scripts/boot-mmcblk1p1-ext3.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv bootargs debug root=/dev/mmcblk1p1 console=ttyS0,115200n8 rootdelay=2 rootfstype=ext3 ro vram=6272K omapfb.vram=0:1500K
-fatload mmc 0 0x80300000 uImage; bootm 0x80300000
diff --git a/recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk.cmd b/recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk
similarity index 52%
rename from recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk.cmd
rename to recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk
index 10c82a7..14ec45c 100644
--- a/recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk.cmd
+++ b/recipes/pandora-system/pandora-uboot-scripts/boot-ramdisk
@@ -1,5 +1,2 @@
 setenv bootargs debug console=ttyS2,115200n8 ramdisk_size=8192 root=/dev/ram0 rw rootfstype=ext2 initrd=0x81600000,8M vram=6272K omapfb.vram=0:1500K
 fatload mmc 0 0x80300000 uImage; fatload mmc 0 0x81600000 rd-ext2.bin; bootm 0x80300000
-# setenv bootargs debug root=/dev/mmcblk0p2 console=ttyS0,115200n8 rootdelay=2 rootfstype=ext3 ro vram=6272K omapfb.vram=0:1500K
-# fatload mmc 0 0x80300000 uImage; bootm 0x80300000
-# omapfb.debug=y omapdss.debug=y