diff options
author | Jan Luebbe <jlu@pengutronix.de> | 2012-08-27 22:41:41 +0200 |
---|---|---|
committer | Jan Luebbe <jlu@pengutronix.de> | 2012-09-02 12:20:37 +0200 |
commit | 5f64c98d41665f6e5b3f90616ee15815e3d27b77 (patch) | |
tree | fbd37484fdfc718615b7382dda526701ea1f554b | |
parent | 8e4badc85357c2e87c9067d9860843c2a12f47e1 (diff) | |
download | platform-pengutronix-vexpress-5f64c98d41665f6e5b3f90616ee15815e3d27b77.tar.gz platform-pengutronix-vexpress-5f64c98d41665f6e5b3f90616ee15815e3d27b77.tar.xz |
kernel: update to version 3.5.3
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
-rw-r--r-- | kernelconfig-3.5.3 (renamed from kernelconfig-3.4.2) | 104 | ||||
-rw-r--r-- | platformconfig | 35 |
2 files changed, 94 insertions, 45 deletions
diff --git a/kernelconfig-3.4.2 b/kernelconfig-3.5.3 index 5153b91..6a5e3da 100644 --- a/kernelconfig-3.4.2 +++ b/kernelconfig-3.5.3 @@ -1,22 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.2 Kernel Configuration +# Linux/arm 3.5.3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_ARCH_USES_GETTIMEOFFSET is not set -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_KTIME_SCALAR=y CONFIG_HAVE_PROC_CPU=y CONFIG_NO_IOPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y @@ -58,9 +51,21 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_HARDIRQS_SW_RESEND=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y + +# +# Timers subsystem +# +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set # # RCU Subsystem @@ -68,6 +73,7 @@ CONFIG_IRQ_DOMAIN=y CONFIG_TREE_RCU=y # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y @@ -87,7 +93,6 @@ CONFIG_CGROUPS=y CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set # CONFIG_SCHED_AUTOGROUP is not set @@ -128,7 +133,6 @@ CONFIG_PERF_USE_VMALLOC=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y -# CONFIG_PERF_COUNTERS is not set # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y @@ -142,7 +146,11 @@ CONFIG_HAVE_OPROFILE=y # CONFIG_JUMP_LABEL is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -240,8 +248,6 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP23XX is not set -# CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set @@ -276,10 +282,6 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_ZYNQ is not set # -# System MMU -# - -# # Versatile Express platform type # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y @@ -357,10 +359,6 @@ CONFIG_ARM_AMBA=y # # Kernel Features # -CONFIG_TICK_ONESHOT=y -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_HAVE_SMP=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y @@ -368,6 +366,7 @@ CONFIG_ARM_CPU_TOPOLOGY=y # CONFIG_SCHED_MC is not set # CONFIG_SCHED_SMT is not set CONFIG_HAVE_ARM_SCU=y +# CONFIG_ARM_ARCH_TIMER is not set CONFIG_HAVE_ARM_TWD=y # CONFIG_VMSPLIT_3G is not set CONFIG_VMSPLIT_2G=y @@ -402,7 +401,9 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -457,6 +458,8 @@ CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set # CONFIG_PM_RUNTIME is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set @@ -544,7 +547,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set @@ -557,7 +559,6 @@ CONFIG_RFS_ACCEL=y CONFIG_XPS=y # CONFIG_NETPRIO_CGROUP is not set CONFIG_BQL=y -CONFIG_HAVE_BPF_JIT=y # CONFIG_BPF_JIT is not set # @@ -576,6 +577,7 @@ CONFIG_HAVE_BPF_JIT=y # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set # CONFIG_NFC is not set +CONFIG_HAVE_BPF_JIT=y # # Device Drivers @@ -597,6 +599,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set # CONFIG_DMA_SHARED_BUFFER is not set +# CONFIG_CMA is not set # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_TESTS is not set @@ -831,6 +834,7 @@ CONFIG_SMSC911X=y # CONFIG_SMSC911X_ARCH_HOOKS is not set CONFIG_NET_VENDOR_STMICRO=y # CONFIG_STMMAC_ETH is not set +# CONFIG_NET_VENDOR_WIZNET is not set CONFIG_PHYLIB=y # @@ -880,6 +884,7 @@ CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set # CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set # # Userland interfaces @@ -977,7 +982,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_RAMOOPS is not set # CONFIG_I2C is not set # CONFIG_SPI is not set # CONFIG_HSI is not set @@ -998,6 +1002,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # # Enable Device Drivers -> PPS to see the PTP clock options. # +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set @@ -1067,6 +1072,7 @@ CONFIG_FB_ARMCLCD=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set # CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -1118,16 +1124,13 @@ CONFIG_SND_USB=y # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=y -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -# CONFIG_HIDRAW is not set # -# USB Input Devices +# HID support # -CONFIG_USB_HID=y -# CONFIG_HID_PID is not set -# CONFIG_USB_HIDDEV is not set +CONFIG_HID=y +# CONFIG_HIDRAW is not set +CONFIG_HID_GENERIC=y # # Special HID drivers @@ -1135,6 +1138,7 @@ CONFIG_USB_HID=y CONFIG_HID_A4TECH=y # CONFIG_HID_ACRUX is not set CONFIG_HID_APPLE=y +# CONFIG_HID_AUREAL is not set CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y @@ -1186,6 +1190,13 @@ CONFIG_HID_THRUSTMASTER=y CONFIG_HID_ZEROPLUS=y # CONFIG_ZEROPLUS_FF is not set # CONFIG_HID_ZYDACRON is not set + +# +# USB HID support +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_XHCI is not set @@ -1199,8 +1210,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # -# CONFIG_USB_DEVICEFS is not set -# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_MON=y # CONFIG_USB_WUSB_CBAF is not set @@ -1215,6 +1224,7 @@ CONFIG_USB_ISP1760_HCD=y # CONFIG_USB_ISP1362_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_CHIPIDEA is not set # # USB Device Class drivers @@ -1282,6 +1292,10 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_YUREX is not set + +# +# USB Physical Layer drivers +# # CONFIG_USB_GADGET is not set # @@ -1389,6 +1403,9 @@ CONFIG_IOMMU_SUPPORT=y # # CONFIG_VIRT_DRIVERS is not set # CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set # # File systems @@ -1477,6 +1494,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y +CONFIG_NFS_V2=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set @@ -1531,6 +1549,17 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set # CONFIG_NLS_UTF8 is not set # @@ -1543,6 +1572,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set @@ -1551,6 +1581,8 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -1616,6 +1648,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_PROBE_EVENTS is not set # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set @@ -1644,6 +1677,10 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_USER is not set @@ -1682,7 +1719,7 @@ CONFIG_CRYPTO=y # # Digest # -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set @@ -1774,3 +1811,4 @@ CONFIG_DQL=y CONFIG_NLATTR=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set +# CONFIG_DDR is not set diff --git a/platformconfig b/platformconfig index 22c618c..0409c4c 100644 --- a/platformconfig +++ b/platformconfig @@ -1,8 +1,8 @@ # # Automatically generated make config: don't edit -# PTXdist 2012.06.0 +# PTXdist 2012.07.0-00032-g4f8613d # -PTXCONF_PLATFORMCONFIG_VERSION="2012.06.0" +PTXCONF_PLATFORMCONFIG_VERSION="2012.07.0-00032-g4f8613d" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y # ------------------------------------ # PTXCONF_PLATFORM="pengutronix-vexpress" -PTXCONF_PLATFORM_VERSION="-2012.06.0" +PTXCONF_PLATFORM_VERSION="-2012.07.0+master" # # architecture @@ -43,10 +43,10 @@ PTXCONF_ARCH_SUPPORTS_ENDIAN_BIG=y PTXCONF_ARCH_SUPPORTS_ENDIAN_LITTLE=y # PTXCONF_ENDIAN_BIG is not set PTXCONF_ENDIAN_LITTLE=y -# PTXCONF_ARCH_ARM_V6 is not set +PTXCONF_ARCH_ARM_V6=y # PTXCONF_ARCH_ARM_IWMMXT is not set -# PTXCONF_ARCH_ARM_NEON is not set -# PTXCONF_HAS_HARDFLOAT is not set +PTXCONF_ARCH_ARM_NEON=y +PTXCONF_HAS_HARDFLOAT=y PTXCONF_HAS_MMU=y PTXCONF_SIZEOF_LONG_DOUBLE="8" PTXCONF_ARCH_STRING="arm" @@ -83,18 +83,18 @@ PTXCONF_KERNEL=y PTXCONF_KERNEL_MODULES=y PTXCONF_KERNEL_MODULES_INSTALL=y PTXCONF_KERNEL_MODULES_BUILD="modules" -PTXCONF_KERNEL_VERSION="3.4.2" -PTXCONF_KERNEL_MD5="ee05aa80a4766bc1f3f2cd2bf85b6267" +PTXCONF_KERNEL_VERSION="3.5.3" +PTXCONF_KERNEL_MD5="025dad5bdd416c052e78130d6e527379" PTXCONF_KERNEL_ARCH_STRING="arm" # PTXCONF_KERNEL_IMAGE_BZ is not set -# PTXCONF_KERNEL_IMAGE_Z is not set +PTXCONF_KERNEL_IMAGE_Z=y # PTXCONF_KERNEL_IMAGE_XIP is not set -PTXCONF_KERNEL_IMAGE_U=y +# PTXCONF_KERNEL_IMAGE_U is not set # PTXCONF_KERNEL_IMAGE_VM is not set # PTXCONF_KERNEL_IMAGE_VMLINUX is not set # PTXCONF_KERNEL_IMAGE_RAW is not set # PTXCONF_KERNEL_IMAGE_SIMPLE is not set -PTXCONF_KERNEL_IMAGE="uImage" +PTXCONF_KERNEL_IMAGE="zImage" # PTXCONF_KERNEL_XZ is not set # PTXCONF_KERNEL_LZOP is not set @@ -142,6 +142,7 @@ PTXCONF_FLASH_BLOCKSIZE="128k" # # image creation options # +# PTXCONF_IMAGE_BOOT_MLO_VFAT is not set # PTXCONF_IMAGE_CPIO is not set # PTXCONF_IMAGE_CPIO_GZ is not set PTXCONF_IMAGE_EXT2=y @@ -149,6 +150,7 @@ PTXCONF_IMAGE_EXT2_SIZE=40960 PTXCONF_IMAGE_EXT2_EXTRA_ARGS="-N3000" # PTXCONF_IMAGE_EXT2_GZIP is not set PTXCONF_IMAGE_EXT2_JOURNAL=y +PTXCONF_IMAGE_EXT2_EXT4=y PTXCONF_IMAGE_HD=y PTXCONF_IMAGE_HD_PART1=y PTXCONF_IMAGE_HD_PART1_START="2048" @@ -175,6 +177,13 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y # PTXCONF_IMAGE_UBI is not set # PTXCONF_IMAGE_UBIFS is not set # PTXCONF_IMAGE_UIMAGE is not set + +# +# new image creation options +# +# PTXCONF_IMAGE_BOOT_MLO is not set +# PTXCONF_IMAGE_ROOT_EXT is not set +# PTXCONF_IMAGE_ROOT_TGZ is not set PTXCONF_CROSS_MODULE_INIT_TOOLS=y # PTXCONF_HOST_CDRKIT is not set # PTXCONF_HOST_CMAKE is not set @@ -182,12 +191,14 @@ PTXCONF_CROSS_MODULE_INIT_TOOLS=y # PTXCONF_HOST_DOSFSTOOLS is not set PTXCONF_HOST_E2FSPROGS=y PTXCONF_HOST_GENEXT2FS=y +# PTXCONF_HOST_GENIMAGE is not set PTXCONF_HOST_GENPART=y # PTXCONF_HOST_LIBICONV is not set # PTXCONF_HOST_GETTEXT is not set # PTXCONF_HOST_LIBBLKID is not set # PTXCONF_HOST_LIBBZ2 is not set # PTXCONF_HOST_LIBCAP is not set +# PTXCONF_HOST_LIBCONFUSE is not set # PTXCONF_HOST_LIBLZO is not set # PTXCONF_HOST_LIBUUID is not set # PTXCONF_HOST_LZOP is not set @@ -196,7 +207,7 @@ PTXCONF_HOST_GENPART=y # PTXCONF_HOST_MTOOLS is not set # PTXCONF_HOST_OPENSSL is not set # PTXCONF_HOST_SQUASHFS_TOOLS is not set -PTXCONF_HOST_U_BOOT_TOOLS=y +# PTXCONF_HOST_U_BOOT_TOOLS is not set # PTXCONF_HOST_UTIL_LINUX_NG is not set # PTXCONF_HOST_XL_TOOLS is not set # PTXCONF_HOST_XZ is not set |