From: Victor Martinez Date: Wed, 14 Aug 2013 23:50:28 +0000 (+0200) Subject: Update to 3.6.11 X-Git-Url: http://gitweb/?a=commitdiff_plain;h=b0c2b91d4b59fdda272e0ed2625203d0300dff7f;p=kernel%2Fvexpress.git Update to 3.6.11 --- diff --git a/Makefile b/Makefile index e291493..63ce31e 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PWD = $(shell pwd) WORK = $(PWD)/work CROSSTOOLS = $(PWD)/../../toolchain/crosstools -KERNEL_VERSION = 3.5.4 +KERNEL_VERSION = 3.6.11 .PHONY: all clean image modules map config diff --git a/config-3.5.4 b/config-3.6.11 similarity index 97% rename from config-3.5.4 rename to config-3.6.11 index f3ea3ce..9876fe0 100644 --- a/config-3.5.4 +++ b/config-3.6.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.5.4 Kernel Configuration +# Linux/arm 3.6.11 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -157,6 +157,7 @@ CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y # # GCOV-based kernel profiling @@ -227,6 +228,7 @@ CONFIG_FREEZER=y # System Type # CONFIG_MMU=y +# CONFIG_ARCH_SOCFPGA is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set @@ -249,6 +251,7 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LPC32XX is not set @@ -345,6 +348,7 @@ CONFIG_PL310_ERRATA_753970=y # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set # CONFIG_PL310_ERRATA_769419 is not set +# CONFIG_ARM_ERRATA_775420 is not set CONFIG_ARM_GIC=y CONFIG_ICST=y @@ -430,6 +434,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y # CPU Power Management # # CONFIG_CPU_IDLE is not set +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # # Floating point emulation @@ -496,6 +501,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set +# CONFIG_NET_IPVTI is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -692,7 +698,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 # EEPROM support # # CONFIG_EEPROM_93CX6 is not set -# CONFIG_IWMC3200TOP is not set # # Texas Instruments shared transport line discipline @@ -726,7 +731,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -840,6 +844,7 @@ CONFIG_PHYLIB=y # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set # CONFIG_NATIONAL_PHY is not set @@ -998,6 +1003,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set @@ -1023,6 +1029,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set # CONFIG_ABX500_CORE is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -1121,6 +1128,7 @@ CONFIG_AC97_BUS=y # CONFIG_HID=y # CONFIG_HIDRAW is not set +# CONFIG_UHID is not set CONFIG_HID_GENERIC=y # @@ -1148,6 +1156,7 @@ CONFIG_HID_GYRATION=y CONFIG_HID_TWINHAN=y CONFIG_HID_KENSINGTON=y # CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO_TPKBD is not set CONFIG_HID_LOGITECH=y CONFIG_HID_LOGITECH_DJ=m # CONFIG_LOGITECH_FF is not set @@ -1247,7 +1256,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -1321,6 +1329,7 @@ CONFIG_MMC_ARMMMCI=y # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set +# CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1377,7 +1386,13 @@ CONFIG_RTC_DRV_PL031=y # # CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_MACH_CLKDEV=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_DEBUG is not set # # Hardware Spinlock drivers @@ -1397,10 +1412,12 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set +# CONFIG_PWM is not set # # File systems # +CONFIG_DCACHE_WORD_ACCESS=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set @@ -1497,6 +1514,7 @@ CONFIG_NFS_V2=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y @@ -1626,7 +1644,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_LKDTM is not set -# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_HAVE_FUNCTION_TRACER=y @@ -1660,11 +1678,15 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_ARM_UNWIND=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_VEXPRESS_UART0_DETECT is not set +# CONFIG_DEBUG_VEXPRESS_UART0_CA9 is not set +# CONFIG_DEBUG_VEXPRESS_UART0_RS1 is not set CONFIG_DEBUG_LL_UART_NONE=y # CONFIG_DEBUG_ICEDCC is not set # CONFIG_DEBUG_SEMIHOSTING is not set CONFIG_EARLY_PRINTK=y # CONFIG_OC_ETM is not set +# CONFIG_PID_IN_CONTEXTIDR is not set # # Security options @@ -1682,6 +1704,8 @@ CONFIG_DEFAULT_SECURITY="" # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IO=y # CONFIG_CRC_CCITT is not set @@ -1719,6 +1743,7 @@ CONFIG_HAS_DMA=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set