Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb b/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb
index 16e11f8..e816bef 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "2.6.37"
 
-PR = "r2"
+PR = "r3"
 SRCREV = ""
 
 MODULE = "linux-2.6.37"
@@ -45,7 +45,7 @@ kernel_do_install_append() {
 
 pkg_postinst_kernel-image () {
         if [ -d /proc/stb ] ; then
-                flash_eraseall -j /dev/mtd2
+                flash_erase /dev/mtd2 0 0
                 nandwrite -p /dev/mtd2 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz
         fi
         rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
index b7560d5..1e7ffae 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PR = "r1"
+PR = "r2"
 KV = "3.1.1"
 SRCREV = "r2"
 
@@ -44,7 +44,7 @@ kernel_do_install_append() {
 
 pkg_postinst_kernel-image () {
         if [ -d /proc/stb ] ; then
-                flash_eraseall -j /dev/mtd1
+                flash_erase /dev/mtd1 0 0
                 nandwrite -p /dev/mtd1 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz
         fi
         rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
index 3dafb69..9555656 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.3.6"
 
-PR = "r5"
+PR = "r6"
 SRCREV = ""
 
 MODULE = "linux-3.3.6"
@@ -45,7 +45,7 @@ kernel_do_install_append() {
 
 pkg_postinst_kernel-image () {
         if [ -d /proc/stb ] ; then
-                flash_eraseall -j /dev/mtd2
+                flash_erase /dev/mtd2 0 0
                 nandwrite -p /dev/mtd2 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz
         fi
         rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
index 0df097c..f1739a6 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.3.8"
 
-PR = "r0"
+PR = "r1"
 SRCREV = ""
 
 MODULE = "linux-3.3.8"
@@ -45,7 +45,7 @@ kernel_do_install_append() {
 
 pkg_postinst_kernel-image () {
         if [ -d /proc/stb ] ; then
-                flash_eraseall -j /dev/mtd2
+                flash_erase /dev/mtd2 0 0
                 nandwrite -p /dev/mtd2 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz
         fi
         rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz