I have made the following changes intended for : CE:Adaptation:N950-N9 / kernel-adaptation-n950
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7764 Thank You, philippedeswert [This message was auto-generated] --- Request # 7764: Messages from BOSS: State: review at 2013-01-29T15:19:55 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:philippedeswert:branches:CE:Adaptation:N950-N9 / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,4 @@ +* Fri Jan 25 2013 Philippe De Swert <[email protected]> - 2.6.32.20130129.1 +- Set CONFIG_USB_GADGET_VBUS_DRAW to 500 to allow for usb charging without g_nokia +- Add eCrypts support + old: ---- kernel-n9-2.6.32.20121810.5.tar.bz2 new: ---- kernel-n9-2.6.32.20130129.1.tar.bz2 spec files: ----------- --- kernel-adaptation-n950-debug.spec +++ kernel-adaptation-n950-debug.spec @@ -1,6 +1,6 @@ Name: kernel-adaptation-n950-debug Summary: Kernel Adaptation for n950 -Version: 2.6.32.20121810.5 +Version: 2.6.32.20130129.1 Release: 1 Group: Kernel/Linux Kernel License: GPLv2 @@ -50,7 +50,7 @@ cp %{SOURCE1} ./.config # make sure EXTRAVERSION says what we want it to say -perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.5-n950-debug/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20130129.1-n950-debug/" Makefile # Verify this spec is using the latest template version /usr/bin/mer_verify_kernel_spec 1 --fatal-if-old --- kernel-adaptation-n950.spec +++ kernel-adaptation-n950.spec @@ -1,6 +1,6 @@ Name: kernel-adaptation-n950 Summary: Kernel Adaptation for n950 -Version: 2.6.32.20121810.5 +Version: 2.6.32.20130129.1 Release: 1 Group: Kernel/Linux Kernel License: GPLv2 @@ -50,7 +50,7 @@ cp %{SOURCE1} ./.config # make sure EXTRAVERSION says what we want it to say -perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.5-n950/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20130129.1-n950/" Makefile # Verify this spec is using the latest template version /usr/bin/mer_verify_kernel_spec 1 --fatal-if-old other changes: -------------- ++++++ generate-spec.sh --- generate-spec.sh +++ generate-spec.sh @@ -3,7 +3,7 @@ DEBUG_SUFFIX=n950-debug SUFFIX=n950 HW=n950 -EXTRA=20121810.5 +EXTRA=20130129.1 sed -e "s/SUFFIX/${SUFFIX}/" \ -e "s/HARDWARE/${HW}/" \ ++++++ kernel-adaptation-n950-debug.config --- kernel-adaptation-n950-debug.config +++ kernel-adaptation-n950-debug.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.54 -# Sun Oct 28 22:33:46 2012 +# Tue Jan 29 16:15:17 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1601,7 +1601,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1701,9 +1701,8 @@ # CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_DEBUG=y +# CONFIG_RTC_HCTOSYS is not set +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -1727,7 +1726,7 @@ # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_TWL4030=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set @@ -1899,6 +1898,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -2102,7 +2102,8 @@ # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set ++++++ kernel-adaptation-n950.config --- kernel-adaptation-n950.config +++ kernel-adaptation-n950.config @@ -1,8 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.54 -# Sun Oct 28 22:33:46 2012 -# +# Tue Jan 29 16:10:23 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1602,7 +1601,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1702,8 +1701,7 @@ # CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_HCTOSYS is not set # CONFIG_RTC_DEBUG is not set # @@ -1728,7 +1726,7 @@ # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_TWL4030=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set @@ -1900,6 +1898,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -2088,7 +2087,8 @@ # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set ++++++ kernel-n9-2.6.32.20121810.5.tar.bz2 -> kernel-n9-2.6.32.20130129.1.tar.bz2 --- .gitignore +++ .gitignore @@ -29,6 +29,7 @@ *.lzma *.patch *.gcno +*.builtin # # Top-level generic files --- arch/arm/configs/rm696_nemo_debug_defconfig +++ arch/arm/configs/rm696_nemo_debug_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.54 -# Tue Oct 16 09:20:20 2012 +# Tue Jan 29 16:15:17 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1601,7 +1601,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1898,6 +1898,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -2087,9 +2088,6 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set -# CONFIG_BRANCH_PROFILE_NONE is not set -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y @@ -2104,7 +2102,8 @@ # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set --- arch/arm/configs/rm696_nemo_defconfig +++ arch/arm/configs/rm696_nemo_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.54 -# Sat Oct 13 06:59:58 2012 +# Tue Jan 29 16:10:23 2013 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1601,7 +1601,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1898,6 +1898,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set @@ -2086,7 +2087,8 @@ # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set
