diff options
author | schon <schon@dev03-server> | 2012-11-08 09:05:50 (GMT) |
---|---|---|
committer | schon <schon@dev03-server> | 2012-11-08 09:05:50 (GMT) |
commit | 7b9c936a7b1090cbc5efa7a2218f77a045dae501 (patch) | |
tree | 005c75630cf93682f08b045de3569b3d1cc72f1b | |
parent | 9ee1c2406915c9ae1ae2b3210a66ae4fc41dd44f (diff) |
Change kernel config
Update driver
- Support 1080p50, 1080p
-rw-r--r-- | conf/machine/vuduo2.conf | 1 | ||||
-rw-r--r-- | conf/machine/vusolo2.conf | 1 | ||||
-rw-r--r-- | recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig | 7 | ||||
-rw-r--r-- | recipes/vuplus/vuplus-bootlogo.bb | 2 | ||||
-rw-r--r-- | recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin | bin | 5977986 -> 5977953 bytes | |||
-rwxr-xr-x | recipes/vuplus/vuplus-dvb-modules.bb | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/conf/machine/vuduo2.conf b/conf/machine/vuduo2.conf index 5b99e17..4c275bb 100644 --- a/conf/machine/vuduo2.conf +++ b/conf/machine/vuduo2.conf @@ -133,6 +133,7 @@ IMAGE_CMD_ubi_append = "; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${DEPLOY_DIR_IMAGE}/vuplus/duo2/root_cfe_auto.bin; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/duo2/kernel_cfe_auto.bin; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/duo2/initrd_cfe_auto.bin; \ + touch ${DEPLOY_DIR_IMAGE}/vuplus/solo2/reboot.update; \ cd ${DEPLOY_DIR_IMAGE}; \ zip ${IMAGE_NAME}_usb.zip vuplus/duo2/*; \ rm -rf vuplus; \ diff --git a/conf/machine/vusolo2.conf b/conf/machine/vusolo2.conf index e0994fc..b24fdd8 100644 --- a/conf/machine/vusolo2.conf +++ b/conf/machine/vusolo2.conf @@ -71,6 +71,7 @@ IMAGE_CMD_ubi_append = "; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz ${DEPLOY_DIR_IMAGE}/vuplus/solo2/kernel_cfe_auto.bin; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.initrd_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/initrd_cfe_auto.bin; \ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.splash_cfe_auto.bin ${DEPLOY_DIR_IMAGE}/vuplus/solo2/splash_cfe_auto.bin; \ + touch ${DEPLOY_DIR_IMAGE}/vuplus/solo2/reboot.update; \ cd ${DEPLOY_DIR_IMAGE}; \ zip ${IMAGE_NAME}_usb.zip vuplus/solo2/*; \ rm -rf vuplus; \ diff --git a/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig b/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig index 5c8667a..0ff1a09 100644 --- a/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig +++ b/recipes/linux/linux-vusolo2-3.3.6/vusolo2_defconfig @@ -98,7 +98,7 @@ CONFIG_BCMGENET_NAPI=y # CONFIG_BCMGENET_TX_CSUM is not set # CONFIG_BCMGENET_DUMP_DATA is not set # CONFIG_BCMGENET_DUMP_TRACE is not set -CONFIG_BRCM_MOCA=y +# CONFIG_BRCM_MOCA is not set CONFIG_BRCM_USB=y # CONFIG_BRCM_OVERRIDE_USB is not set # CONFIG_BRCM_SDIO is not set @@ -242,7 +242,7 @@ CONFIG_SMP=y CONFIG_SYS_SUPPORTS_SMP=y CONFIG_NR_CPUS=2 CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y +# CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_HZ_48 is not set @@ -301,7 +301,6 @@ CONFIG_TREE_RCU=y # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set -# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 @@ -2328,7 +2327,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_DETECT_HUNG_TASK is not set -CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set diff --git a/recipes/vuplus/vuplus-bootlogo.bb b/recipes/vuplus/vuplus-bootlogo.bb index ca53c02..12c1825 100644 --- a/recipes/vuplus/vuplus-bootlogo.bb +++ b/recipes/vuplus/vuplus-bootlogo.bb @@ -7,7 +7,7 @@ IMAGES_VERSION = "1" BINARY_VERSION = "7" PV = "${BINARY_VERSION}.${IMAGES_VERSION}" -PR = "r6" +PR = "r7" KERNEL_VERSION = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}" diff --git a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin Binary files differindex 21b43c3..3cdce9b 100644 --- a/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin +++ b/recipes/vuplus/vuplus-bootlogo/vusolo2/initrd_cfe_auto.bin diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb index 21d113e..79400d5 100755 --- a/recipes/vuplus/vuplus-dvb-modules.bb +++ b/recipes/vuplus/vuplus-dvb-modules.bb @@ -16,7 +16,7 @@ SRCDATE_vusolo = "20121025" SRCDATE_vuuno = "20121025" SRCDATE_vuultimo = "20121025" SRCDATE_vuduo2 = "20121102" -SRCDATE_vusolo2 = "20121107" +SRCDATE_vusolo2 = "20121108" MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb" MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb" |