From 043b6eebc5e2a130e5fe45df516014aa68fb6a7d Mon Sep 17 00:00:00 2001 From: schon Date: Fri, 2 Nov 2012 16:28:27 +0900 Subject: update driver, initrd kernel fix kernel partition --- conf/machine/vuduo2.conf | 6 +++--- recipes/linux/linux-vuduo2_2.6.37.bb | 4 ++-- .../linux/linux-vusolo2-3.3.6/vusolo2_defconfig | 5 +++-- recipes/linux/linux-vusolo2_3.3.6.bb | 5 +++-- .../vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin | Bin 5757824 -> 5977986 bytes recipes/vuplus/vuplus-dvb-modules.bb | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/conf/machine/vuduo2.conf b/conf/machine/vuduo2.conf index 30533d9..877d6d3 100644 --- a/conf/machine/vuduo2.conf +++ b/conf/machine/vuduo2.conf @@ -45,9 +45,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = ${@base_contains('PREFERRED_VERSION_linux- require conf/machine/include/vuplus-modules2.inc -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_WIFI_MODULES}', '', d)} -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_DVB_MODULES}', '', d)} -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_3G_MODULES}', '', d)} +#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_WIFI_MODULES}', '', d)} +#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_DVB_MODULES}', '', d)} +#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.37', '${KERNEL_3G_MODULES}', '', d)} PREFERRED_VERSION_wpa-supplicant = ${@base_contains('PREFERRED_VERSION_linux-vuduo2', '2.6.18', '0.5.10', '0.7.3', d)} diff --git a/recipes/linux/linux-vuduo2_2.6.37.bb b/recipes/linux/linux-vuduo2_2.6.37.bb index 8d9766b..68a38eb 100644 --- a/recipes/linux/linux-vuduo2_2.6.37.bb +++ b/recipes/linux/linux-vuduo2_2.6.37.bb @@ -42,8 +42,8 @@ kernel_do_install_append() { pkg_postinst_kernel-image () { if [ -d /proc/stb ] ; then - flash_eraseall -j /dev/mtd1 - nandwrite -p /dev/mtd1 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz + flash_eraseall -j /dev/mtd2 + nandwrite -p /dev/mtd2 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz fi rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz true diff --git a/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig b/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig index 126cc3f..5c8667a 100644 --- a/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig +++ b/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig @@ -642,7 +642,8 @@ CONFIG_MAC80211_LEDS=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="" -# CONFIG_DEVTMPFS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -1551,7 +1552,7 @@ CONFIG_TTPCI_EEPROM=m # Supported USB Adapters # CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DEBUG=y CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_DIBUSB_MB=m CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y diff --git a/recipes/linux/linux-vusolo2_3.3.6.bb b/recipes/linux/linux-vusolo2_3.3.6.bb index 66c830d..902401d 100644 --- a/recipes/linux/linux-vusolo2_3.3.6.bb +++ b/recipes/linux/linux-vusolo2_3.3.6.bb @@ -3,6 +3,7 @@ LICENSE = "GPL" KV = "2.6.37" +PR = "r1" SRCREV = "" MODULE = "linux-2.6.37" @@ -40,8 +41,8 @@ kernel_do_install_append() { pkg_postinst_kernel-image () { if [ -d /proc/stb ] ; then - flash_eraseall -j /dev/mtd1 - nandwrite -p /dev/mtd1 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz + flash_eraseall -j /dev/mtd2 + nandwrite -p /dev/mtd2 /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz fi rm -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}.gz true diff --git a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin index 25f85e0..21b43c3 100644 Binary files a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin and b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin differ diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb index 2122926..dd0c028 100755 --- a/recipes/vuplus/vuplus-dvb-modules.bb +++ b/recipes/vuplus/vuplus-dvb-modules.bb @@ -15,7 +15,7 @@ SRCDATE_bm750 = "20121025" SRCDATE_vusolo = "20121025" SRCDATE_vuuno = "20121025" SRCDATE_vuultimo = "20121025" -SRCDATE_vuduo2 = "20121025" +SRCDATE_vuduo2 = "20121031" SRCDATE_vusolo2 = "20121030" MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb" -- cgit