Commit 36b8659f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  ARM: 5639/1: arm: clkdev.c should include <linux/clk.h>
  ARM: 5638/1: arch/arm/kernel/signal.c: use correct address space for CRUNCH
  ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
  ARM: S3C64XX: serial: Fix section mismatch warning
  ARM: S3C24XX: serial: Fix section mismatch warnings
  ARM: S3C: PWM fix for low duty cycle
  ARM: 5597/1: [PCI] reset all internal hardware prior PCI initialization
  ARM: 5627/1: Fix restoring of lr at the end of mcount
  ARM: 5624/1: Document cache aliasing region
  S3C64XX: Fix ARMCLK configuration
  S3C64XX: Fix get_rate() for ARMCLK
  S3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip
  mx3 defconfig update
  mx27 defconfig update
  ARM: 5623/1: Treo680: ir shutdown typo fix
  ARM: includecheck fix: plat-stmp3xxx/pinmux.c
  ARM: includecheck fix: plat-s3c64xx/pm.c
  ARM: includecheck fix: mach-omap2/mcbsp.c
  ARM: includecheck fix: mach-omap1/mcbsp.c
  ARM: includecheck fix: board-sffsdr.c
  ...
parents cba8784a c0c60c4b

Documentation/arm/memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use. 
				For SA11xx and Xscale, this is used to

				setup a minicache mapping.



ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.



ffff1000	ffff7fff	Reserved.

				Platforms must not use this address range.

arch/arm/boot/compressed/misc.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ unsigned int __machine_arch_type; 


static void putstr(const char *ptr);



#include <linux/compiler.h>

#include <mach/uncompress.h>



#ifdef CONFIG_DEBUG_ICEDCC

arch/arm/common/clkdev.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/err.h>

#include <linux/string.h>

#include <linux/mutex.h>

#include <linux/clk.h>



#include <asm/clkdev.h>

#include <mach/clkdev.h>

arch/arm/configs/mx27_defconfig

+185 −85
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc1

# Wed Apr  8 10:18:06 2009

# Linux kernel version: 2.6.31-rc4

# Fri Jul 24 16:08:06 2009

#

CONFIG_ARM=y

CONFIG_HAVE_PWM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,14 +18,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -85,7 +84,12 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Performance Counters

#

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_SLUB is not set
@@ -99,6 +103,12 @@ CONFIG_KPROBES=y 
CONFIG_KRETPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_CLK=y



#

# GCOV-based kernel profiling

#

# CONFIG_GCOV_KERNEL is not set

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y
@@ -111,7 +121,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -138,13 +148,14 @@ CONFIG_FREEZER=y 
# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

CONFIG_ARCH_MXC=y

# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -153,25 +164,25 @@ CONFIG_FREEZER=y 
# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

CONFIG_ARCH_MXC=y

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_W90X900 is not set



#

# Freescale MXC Implementations
@@ -188,6 +199,8 @@ CONFIG_MACH_MX27=y 
CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_PCM970_BASEBOARD=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_MX27LITE=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y
@@ -213,7 +226,6 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_COMMON_CLKDEV=y



#
@@ -238,7 +250,6 @@ CONFIG_PREEMPT=y 
CONFIG_HZ=100

CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

CONFIG_ARCH_FLATMEM_HAS_HOLES=y

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set
@@ -253,10 +264,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y

# CONFIG_UACCESS_WITH_MEMCPY is not set



#

# Boot options
@@ -361,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -474,7 +487,16 @@ CONFIG_MTD_PHYSMAP=y 
# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_MTD_NAND is not set

CONFIG_MTD_NAND=y

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

# CONFIG_MTD_NAND_ECC_SMC is not set

# CONFIG_MTD_NAND_MUSEUM_IDS is not set

# CONFIG_MTD_NAND_GPIO is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

CONFIG_MTD_NAND_MXC=y

# CONFIG_MTD_ONENAND is not set



#
@@ -485,7 +507,15 @@ CONFIG_MTD_PHYSMAP=y 
#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_WL_THRESHOLD=4096

CONFIG_MTD_UBI_BEB_RESERVE=1

# CONFIG_MTD_UBI_GLUEBI is not set



#

# UBI debugging options

#

# CONFIG_MTD_UBI_DEBUG is not set

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -494,7 +524,21 @@ CONFIG_BLK_DEV=y 
# CONFIG_BLK_DEV_RAM is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_MISC_DEVICES is not set

# CONFIG_MG_DISK is not set

CONFIG_MISC_DEVICES=y

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ISL29003 is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

CONFIG_EEPROM_AT24=y

# CONFIG_EEPROM_AT25 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -508,7 +552,6 @@ CONFIG_HAVE_IDE=y 
# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -534,6 +577,8 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

# CONFIG_KS8842 is not set

# CONFIG_KS8851 is not set

CONFIG_FEC=y

# CONFIG_FEC2 is not set

# CONFIG_NETDEV_1000 is not set
@@ -580,6 +625,11 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_TABLET is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_ADS7846 is not set

# CONFIG_TOUCHSCREEN_AD7877 is not set

# CONFIG_TOUCHSCREEN_AD7879_I2C is not set

# CONFIG_TOUCHSCREEN_AD7879_SPI is not set

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_EETI is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set
@@ -592,6 +642,7 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set

# CONFIG_TOUCHSCREEN_TSC2007 is not set

# CONFIG_TOUCHSCREEN_W90X900 is not set

# CONFIG_INPUT_MISC is not set



#
@@ -644,6 +695,7 @@ CONFIG_I2C_HELPER_AUTO=y 
#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

CONFIG_I2C_IMX=y

# CONFIG_I2C_OCORES is not set
@@ -668,7 +720,6 @@ CONFIG_I2C_IMX=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -719,6 +770,7 @@ CONFIG_W1=y 
#

# CONFIG_W1_MASTER_DS2482 is not set

CONFIG_W1_MASTER_MXC=y

# CONFIG_W1_MASTER_DS1WM is not set

# CONFIG_W1_MASTER_GPIO is not set



#
@@ -753,54 +805,16 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_TPS65010 is not set

# CONFIG_TWL4030_CORE is not set

# 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_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

CONFIG_VIDEO_DEV=y

CONFIG_VIDEO_V4L2_COMMON=y

CONFIG_VIDEO_ALLOW_V4L1=y

CONFIG_VIDEO_V4L1_COMPAT=y

# CONFIG_DVB_CORE is not set

CONFIG_VIDEO_MEDIA=y



#

# Multimedia drivers

#

# CONFIG_MEDIA_ATTACH is not set

CONFIG_MEDIA_TUNER=y

# CONFIG_MEDIA_TUNER_CUSTOMISE is not set

CONFIG_MEDIA_TUNER_SIMPLE=y

CONFIG_MEDIA_TUNER_TDA8290=y

CONFIG_MEDIA_TUNER_TDA9887=y

CONFIG_MEDIA_TUNER_TEA5761=y

CONFIG_MEDIA_TUNER_TEA5767=y

CONFIG_MEDIA_TUNER_MT20XX=y

CONFIG_MEDIA_TUNER_XC2028=y

CONFIG_MEDIA_TUNER_XC5000=y

CONFIG_MEDIA_TUNER_MC44S803=y

CONFIG_VIDEO_V4L2=y

CONFIG_VIDEO_V4L1=y

CONFIG_VIDEO_CAPTURE_DRIVERS=y

# CONFIG_VIDEO_ADV_DEBUG is not set

# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set

CONFIG_VIDEO_HELPER_CHIPS_AUTO=y

# CONFIG_VIDEO_VIVI is not set

# CONFIG_VIDEO_CPIA is not set

# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_SOC_CAMERA is not set

# CONFIG_RADIO_ADAPTERS is not set

# CONFIG_DAB is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support
@@ -917,6 +931,7 @@ CONFIG_RTC_DRV_PCF8563=y 
# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

# CONFIG_RTC_DRV_RX8025 is not set



#

# SPI RTC drivers
@@ -962,12 +977,15 @@ CONFIG_RTC_DRV_PCF8563=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set
@@ -1021,6 +1039,12 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_UBIFS_FS=y

# CONFIG_UBIFS_FS_XATTR is not set

# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set

CONFIG_UBIFS_FS_LZO=y

CONFIG_UBIFS_FS_ZLIB=y

# CONFIG_UBIFS_FS_DEBUG is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1119,25 +1143,11 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y 
CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_TRACING=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_FTRACE is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y
@@ -1151,16 +1161,104 @@ CONFIG_ARM_UNWIND=y 
# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_ALGAPI2=y

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_MANAGER2 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set



#

# Authenticated Encryption with Associated Data

#

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_SEQIV is not set



#

# Block modes

#

# CONFIG_CRYPTO_CBC is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_CTS is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_XTS is not set



#

# Hash modes

#

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set



#

# Digest

#

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_RMD128 is not set

# CONFIG_CRYPTO_RMD160 is not set

# CONFIG_CRYPTO_RMD256 is not set

# CONFIG_CRYPTO_RMD320 is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_WP512 is not set



#

# Ciphers

#

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_DES is not set

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_TWOFISH is not set



#

# Compression

#

CONFIG_CRYPTO_DEFLATE=y

# CONFIG_CRYPTO_ZLIB is not set

CONFIG_CRYPTO_LZO=y



#

# Random Number Generation

#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

CONFIG_BINARY_PRINTF=y



#

# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_RATIONAL=y

CONFIG_GENERIC_FIND_LAST_BIT=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC16=y

# CONFIG_CRC_T10DIF is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y
@@ -1168,6 +1266,8 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_LZO_COMPRESS=y

CONFIG_LZO_DECOMPRESS=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/configs/mx3_defconfig

+102 −49
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc1

# Wed Apr  8 11:06:37 2009

# Linux kernel version: 2.6.31-rc4

# Tue Jul 28 14:11:34 2009

#

CONFIG_ARM=y

CONFIG_HAVE_PWM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,14 +18,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -86,7 +85,12 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Performance Counters

#

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set
@@ -97,6 +101,11 @@ CONFIG_HAVE_OPROFILE=y 
# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_CLK=y



#

# GCOV-based kernel profiling

#

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y
@@ -109,7 +118,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -136,13 +145,14 @@ CONFIG_FREEZER=y 
# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

CONFIG_ARCH_MXC=y

# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -151,25 +161,25 @@ CONFIG_FREEZER=y 
# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

CONFIG_ARCH_MXC=y

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_W90X900 is not set



#

# Freescale MXC Implementations
@@ -178,6 +188,7 @@ CONFIG_ARCH_MXC=y 
# CONFIG_ARCH_MX2 is not set

CONFIG_ARCH_MX3=y

CONFIG_ARCH_MX31=y

CONFIG_ARCH_MX35=y



#

# MX3 platforms:
@@ -185,12 +196,19 @@ CONFIG_ARCH_MX31=y 
CONFIG_MACH_MX31ADS=y

CONFIG_MACH_MX31ADS_WM1133_EV1=y

CONFIG_MACH_PCM037=y

CONFIG_MACH_PCM037_EET=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_MX31_3DS=y

CONFIG_MACH_MX31MOBOARD=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_QONG=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_ARCH_HAS_RNGA=y

CONFIG_ARCH_MXC_IOMUX_V3=y



#

# Processor Type
@@ -218,6 +236,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_OUTER_CACHE=y

CONFIG_CACHE_L2X0=y

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_COMMON_CLKDEV=y



#
@@ -242,7 +261,6 @@ CONFIG_PREEMPT=y 
CONFIG_HZ=100

CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

CONFIG_ARCH_FLATMEM_HAS_HOLES=y

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set
@@ -257,10 +275,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 
# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y

# CONFIG_UACCESS_WITH_MEMCPY is not set



#

# Boot options
@@ -362,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -465,7 +485,16 @@ CONFIG_MTD_PHYSMAP=y 
# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_MTD_NAND is not set

CONFIG_MTD_NAND=y

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

# CONFIG_MTD_NAND_ECC_SMC is not set

# CONFIG_MTD_NAND_MUSEUM_IDS is not set

# CONFIG_MTD_NAND_GPIO is not set

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

# CONFIG_MTD_NAND_NANDSIM is not set

# CONFIG_MTD_NAND_PLATFORM is not set

CONFIG_MTD_NAND_MXC=y

# CONFIG_MTD_ONENAND is not set



#
@@ -476,10 +505,30 @@ CONFIG_MTD_PHYSMAP=y 
#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_WL_THRESHOLD=4096

CONFIG_MTD_UBI_BEB_RESERVE=1

# CONFIG_MTD_UBI_GLUEBI is not set



#

# UBI debugging options

#

# CONFIG_MTD_UBI_DEBUG is not set

# CONFIG_PARPORT is not set

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_MISC_DEVICES=y

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ISL29003 is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

CONFIG_EEPROM_AT24=y

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -493,7 +542,6 @@ CONFIG_HAVE_IDE=y 
# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -528,7 +576,7 @@ CONFIG_MII=y 
# CONFIG_ETHOC is not set

# CONFIG_SMC911X is not set

CONFIG_SMSC911X=y

# CONFIG_DNET is not set

CONFIG_DNET=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -537,8 +585,10 @@ CONFIG_SMSC911X=y 
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

CONFIG_CS89x0=y

CONFIG_CS89x0_NONISA_IRQ=y

# CONFIG_CS89x0 is not set

# CONFIG_KS8842 is not set

CONFIG_FEC=y

# CONFIG_FEC2 is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set
@@ -609,6 +659,7 @@ CONFIG_I2C_HELPER_AUTO=y 
#

# I2C system bus drivers (mostly embedded / system-on-chip)

#

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

CONFIG_I2C_IMX=y

# CONFIG_I2C_OCORES is not set
@@ -633,7 +684,6 @@ CONFIG_I2C_IMX=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -669,6 +719,7 @@ CONFIG_W1=y 
#

# CONFIG_W1_MASTER_DS2482 is not set

CONFIG_W1_MASTER_MXC=y

# CONFIG_W1_MASTER_DS1WM is not set

# CONFIG_W1_MASTER_GPIO is not set



#
@@ -703,6 +754,8 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_TPS65010 is not set

# CONFIG_TWL4030_CORE is not set

# 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_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set
@@ -711,10 +764,8 @@ CONFIG_MFD_WM8350_CONFIG_MODE_0=y 
CONFIG_MFD_WM8352_CONFIG_MODE_0=y

CONFIG_MFD_WM8350_I2C=y

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#

# CONFIG_AB3100_CORE is not set

CONFIG_MEDIA_SUPPORT=y



#

# Multimedia core support
@@ -758,8 +809,10 @@ CONFIG_SOC_CAMERA_MT9T031=y 
CONFIG_SOC_CAMERA_MT9V022=y

CONFIG_SOC_CAMERA_TW9910=y

# CONFIG_SOC_CAMERA_PLATFORM is not set

# CONFIG_SOC_CAMERA_OV772X is not set

CONFIG_SOC_CAMERA_OV772X=y

CONFIG_MX3_VIDEO=y

CONFIG_VIDEO_MX3=y

# CONFIG_VIDEO_SH_MOBILE_CEU is not set

# CONFIG_RADIO_ADAPTERS is not set

# CONFIG_DAB is not set
@@ -847,8 +900,11 @@ CONFIG_REGULATOR=y 
# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

CONFIG_REGULATOR_WM8350=y

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -861,10 +917,12 @@ CONFIG_REGULATOR_WM8350=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

# CONFIG_DNOTIFY is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -921,6 +979,12 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_UBIFS_FS=y

# CONFIG_UBIFS_FS_XATTR is not set

# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set

CONFIG_UBIFS_FS_LZO=y

CONFIG_UBIFS_FS_ZLIB=y

# CONFIG_UBIFS_FS_DEBUG is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -937,6 +1001,7 @@ CONFIG_NFS_FS=y 
CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

# CONFIG_NFS_V4_1 is not set

CONFIG_ROOT_NFS=y

# CONFIG_NFSD is not set

CONFIG_LOCKD=y
@@ -979,22 +1044,7 @@ CONFIG_FRAME_WARN=1024 
CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_FTRACE is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

CONFIG_ARM_UNWIND=y
@@ -1094,9 +1144,9 @@ CONFIG_CRYPTO_DES=y 
#

# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

CONFIG_CRYPTO_DEFLATE=y

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_LZO=y



#

# Random Number Generation
@@ -1109,9 +1159,10 @@ CONFIG_CRYPTO_HW=y 
# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_RATIONAL=y

CONFIG_GENERIC_FIND_LAST_BIT=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC16=y

# CONFIG_CRC_T10DIF is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y
@@ -1119,6 +1170,8 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_LZO_COMPRESS=y

CONFIG_LZO_DECOMPRESS=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE