X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-bsp%2Fcommon%2Frecipes%2Flinux%2Flinux-vuplus_3.3.6.bb;h=9555656b1713ff43d1cb3812fec968192f8f0286;hb=3a8416b9628b940abaa6d8c4c825c1617cc3f42f;hp=9ab83081e9902506754fc7beca4cc5854e6fade9;hpb=f0a0db4f3b4c47bea5174106c17782b265f0a93f;p=vuplus_openvuplus_3.0

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 9ab8308..9555656 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
@@ -3,18 +3,19 @@ SECTION = "kernel"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-KV = "2.6.37"
+KV = "3.3.6"
 
-PR = "r2"
+PR = "r6"
 SRCREV = ""
 
-MODULE = "linux-2.6.37"
+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://${MACHINE}_defconfig \
 	"
 
@@ -22,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
@@ -44,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