X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-bsp%2Fcommon%2Frecipes%2Flinux%2Flinux-vuplus_3.3.6.bb;h=a6acaf7f7ab0c6e4a080fb6de8c2ef1a93948033;hp=1dd475cf755f280325d282f7de29b892191e7e65;hb=89fe5e2d4ab32d17585aaf80418c7d31ed559a14;hpb=ff4abac25f637a256fc1e53985b7fcbfe3a52015

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 1dd475c..a6acaf7 100644
--- 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,17 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.3.6"
 
-PR = "r4"
+PR = "r6"
 SRCREV = ""
 
 MODULE = "linux-3.3.6"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.3.6-1.2.tar.bz2 \
-        file://brcm_3.3.patch;patch=1;pnum=1 \
-        file://fix_cpu_proc.patch;patch=1;pnum=1 \
-        file://brcm_mtd_mac.patch;patch=1;pnum=1 \
-        file://dvb_core_5.5.patch;patch=1;pnum=1 \
-	file://brcm_remove_entire_mtd.patch;patch=1;pnum=1 \
+        file://brcm_3.3.patch \
+        file://fix_cpu_proc.patch \
+        file://brcm_mtd_mac.patch \
+        file://dvb_core_5.5.patch \
+	file://brcm_remove_entire_mtd.patch \
         file://${MACHINE}_defconfig \
 	"
 
@@ -23,14 +23,14 @@ S = "${WORKDIR}/linux"
 
 inherit kernel
 
-FILES_kernel-vmlinux = "/boot/vmlinux-*"
-FILES_kernel-image = "/boot/vmlinux.gz"
-
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 KERNEL_OBJECT_SUFFIX = "ko"
+KERNEL_IMAGEDEST = "tmp"
 
+FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz"
+FILES_kernel-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-*"
 
 do_configure_prepend() {
         oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
@@ -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