Commit b899ebeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux:
  ARM: S5PC100: Fixup cross tree merge problems
  ARM: S5P: Fix the platform external interrupt issues.
  ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-git
  ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-git
  ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-git
  ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git
  ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git
  ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-git
  ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-git
parents 55ddf14b b7a5b7ac

arch/arm/configs/s3c2410_defconfig

+61 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.34

# Sat May 22 03:17:31 2010

# Wed May 26 19:04:29 2010

#

CONFIG_ARM=y

CONFIG_HAVE_PWM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_ARCH_USES_GETTIMEOFFSET=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_NO_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y
@@ -35,6 +37,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set
@@ -186,9 +189,11 @@ CONFIG_MMU=y 
# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_VEXPRESS is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CNS3XXX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set
@@ -224,7 +229,7 @@ CONFIG_ARCH_S3C2410=y 
# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5P6440 is not set

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PC100 is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set
@@ -233,6 +238,7 @@ CONFIG_ARCH_S3C2410=y 
# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_PLAT_SPEAR is not set

CONFIG_PLAT_SAMSUNG=y



#
@@ -243,11 +249,15 @@ CONFIG_S3C_BOOT_ERROR_RESET=y 
CONFIG_S3C_BOOT_UART_FORCE_FIFO=y

CONFIG_S3C_LOWLEVEL_UART_PORT=0

CONFIG_SAMSUNG_CLKSRC=y

CONFIG_S3C_GPIO_CFG_S3C24XX=y

CONFIG_S3C_GPIO_PULL_UP=y

CONFIG_SAMSUNG_GPIO_EXTRA=0

CONFIG_S3C_GPIO_SPACE=0

CONFIG_S3C_ADC=y

CONFIG_S3C_DEV_HSMMC=y

CONFIG_S3C_DEV_HWMON=y

CONFIG_S3C_DEV_USB_HOST=y

CONFIG_S3C_DEV_WDT=y

CONFIG_S3C_DEV_NAND=y

CONFIG_S3C_DMA=y
@@ -260,6 +270,7 @@ CONFIG_PLAT_S3C24XX=y 
CONFIG_CPU_LLSERIAL_S3C2410=y

CONFIG_CPU_LLSERIAL_S3C2440=y

CONFIG_S3C2410_CLOCK=y

CONFIG_S3C2443_CLOCK=y

CONFIG_S3C24XX_DCLK=y

CONFIG_S3C24XX_PWM=y

CONFIG_S3C24XX_GPIO_EXTRA=128
@@ -270,6 +281,7 @@ CONFIG_S3C2410_DMA=y 
# CONFIG_S3C2410_DMA_DEBUG is not set

CONFIG_MACH_SMDK=y

CONFIG_S3C24XX_SIMTEC_AUDIO=y

CONFIG_S3C2410_SETUP_TS=y



#

# S3C2400 Machines
@@ -289,6 +301,7 @@ CONFIG_ARCH_H1940=y 
# CONFIG_H1940BT is not set

CONFIG_PM_H1940=y

CONFIG_MACH_N30=y

CONFIG_MACH_N35=y

CONFIG_ARCH_BAST=y

CONFIG_MACH_OTOM=y

CONFIG_MACH_AML_M5900=y
@@ -309,6 +322,11 @@ CONFIG_MACH_SMDK2413=y 
CONFIG_MACH_S3C2413=y

CONFIG_MACH_SMDK2412=y

CONFIG_MACH_VSTMS=y



#

# S3C2416 Machines

#

# CONFIG_MACH_SMDK2416 is not set

CONFIG_CPU_S3C2440=y

CONFIG_CPU_S3C2442=y

CONFIG_CPU_S3C244X=y
@@ -330,6 +348,7 @@ CONFIG_SMDK2440_CPU2440=y 
CONFIG_SMDK2440_CPU2442=y

CONFIG_MACH_AT2440EVB=y

CONFIG_MACH_MINI2440=y

# CONFIG_MACH_RX1950 is not set

CONFIG_CPU_S3C2443=y

CONFIG_S3C2443_DMA=y
@@ -410,6 +429,7 @@ CONFIG_ALIGNMENT_TRAP=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0"

# CONFIG_CMDLINE_FORCE is not set

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -509,7 +529,9 @@ CONFIG_TCP_CONG_ILLINOIS=m 
# CONFIG_DEFAULT_BIC is not set

CONFIG_DEFAULT_CUBIC=y

# CONFIG_DEFAULT_HTCP is not set

# CONFIG_DEFAULT_HYBLA is not set

# CONFIG_DEFAULT_VEGAS is not set

# CONFIG_DEFAULT_VENO is not set

# CONFIG_DEFAULT_WESTWOOD is not set

# CONFIG_DEFAULT_RENO is not set

CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -566,6 +588,16 @@ CONFIG_NF_CONNTRACK_TFTP=m 
CONFIG_NF_CT_NETLINK=m

# CONFIG_NETFILTER_TPROXY is not set

CONFIG_NETFILTER_XTABLES=m



#

# Xtables combined modules

#

CONFIG_NETFILTER_XT_MARK=m

CONFIG_NETFILTER_XT_CONNMARK=m



#

# Xtables targets

#

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

# CONFIG_NETFILTER_XT_TARGET_CT is not set
@@ -577,9 +609,14 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m 
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set

CONFIG_NETFILTER_XT_TARGET_RATEEST=m

# CONFIG_NETFILTER_XT_TARGET_TEE is not set

# CONFIG_NETFILTER_XT_TARGET_TRACE is not set

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set



#

# Xtables matches

#

CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -598,6 +635,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m 
CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

# CONFIG_NETFILTER_XT_MATCH_OSF is not set

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
@@ -605,7 +643,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m 
CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set

CONFIG_NETFILTER_XT_MATCH_SCTP=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -613,7 +650,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m 
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_TIME=m

CONFIG_NETFILTER_XT_MATCH_U32=m

# CONFIG_NETFILTER_XT_MATCH_OSF is not set

CONFIG_IP_VS=m

# CONFIG_IP_VS_IPV6 is not set

# CONFIG_IP_VS_DEBUG is not set
@@ -713,6 +749,7 @@ CONFIG_IP6_NF_RAW=m 
# CONFIG_RDS is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_L2TP is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

# CONFIG_VLAN_8021Q is not set
@@ -739,6 +776,7 @@ CONFIG_NET_CLS_ROUTE=y 
# CONFIG_IRDA is not set

CONFIG_BT=m

CONFIG_BT_L2CAP=m

# CONFIG_BT_L2CAP_EXT_FEATURES is not set

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y
@@ -775,6 +813,7 @@ CONFIG_CFG80211_WEXT=y 
CONFIG_WIRELESS_EXT_SYSFS=y

# CONFIG_LIB80211 is not set

CONFIG_MAC80211=m

CONFIG_MAC80211_HAS_RC=y

CONFIG_MAC80211_RC_MINSTREL=y

# CONFIG_MAC80211_RC_DEFAULT_PID is not set

CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -785,6 +824,7 @@ CONFIG_MAC80211_LEDS=y 
# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set

# CONFIG_CAIF is not set



#

# Device Drivers
@@ -828,6 +868,7 @@ CONFIG_MTD_BLOCK=y 
# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set

# CONFIG_SM_FTL is not set

# CONFIG_MTD_OOPS is not set



#
@@ -882,9 +923,12 @@ CONFIG_MTD_ROM=y 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_NAND=y

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

CONFIG_MTD_NAND_ECC=y

# CONFIG_MTD_NAND_ECC_SMC is not set

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

# CONFIG_MTD_SM_COMMON is not set

# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018

# CONFIG_MTD_NAND_GPIO is not set

CONFIG_MTD_NAND_IDS=y

CONFIG_MTD_NAND_S3C2410=y
@@ -1149,6 +1193,7 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_QT2160 is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_TCA6416 is not set

# CONFIG_KEYBOARD_MATRIX is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_MAX7359 is not set
@@ -1212,6 +1257,7 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_DYNAPRO is not set

# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set

# CONFIG_TOUCHSCREEN_EETI is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_S3C2410 is not set
@@ -1248,6 +1294,7 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y 
# CONFIG_TOUCHSCREEN_TSC2007 is not set

# CONFIG_TOUCHSCREEN_W90X900 is not set

CONFIG_INPUT_MISC=y

# CONFIG_INPUT_AD714X is not set

CONFIG_INPUT_ATI_REMOTE=m

CONFIG_INPUT_ATI_REMOTE2=m

CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -1255,6 +1302,7 @@ CONFIG_INPUT_POWERMATE=m 
CONFIG_INPUT_YEALINK=m

CONFIG_INPUT_CM109=m

CONFIG_INPUT_UINPUT=m

# CONFIG_INPUT_PCF8574 is not set

CONFIG_INPUT_GPIO_ROTARY_ENCODER=m



#
@@ -1287,6 +1335,7 @@ CONFIG_SERIAL_NONSTANDARD=y 
# CONFIG_MOXA_INTELLIO is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_N_HDLC is not set

# CONFIG_N_GSM is not set

# CONFIG_RISCOM8 is not set

# CONFIG_SPECIALIX is not set

# CONFIG_STALDRV is not set
@@ -1324,6 +1373,8 @@ CONFIG_SERIAL_S3C2440=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_ALTERA_JTAGUART is not set

# CONFIG_SERIAL_ALTERA_UART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -1499,6 +1550,7 @@ CONFIG_SENSORS_LM85=m 
# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_ADS7871 is not set

# CONFIG_SENSORS_AMC6821 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set
@@ -1836,10 +1888,12 @@ CONFIG_USB_SERIAL_PL2303=y 
# CONFIG_USB_SERIAL_TI is not set

# CONFIG_USB_SERIAL_CYBERJACK is not set

# CONFIG_USB_SERIAL_XIRCOM is not set

CONFIG_USB_SERIAL_WWAN=m

CONFIG_USB_SERIAL_OPTION=m

# CONFIG_USB_SERIAL_OMNINET is not set

# CONFIG_USB_SERIAL_OPTICON is not set

# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set

# CONFIG_USB_SERIAL_ZIO is not set

# CONFIG_USB_SERIAL_DEBUG is not set



#
@@ -1999,10 +2053,6 @@ CONFIG_RTC_DRV_S3C=y 
# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -2274,6 +2324,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set
@@ -2284,6 +2335,7 @@ CONFIG_BRANCH_PROFILE_NONE=y 
# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

arch/arm/configs/s3c6400_defconfig

+28 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.34

# Sat May 22 03:17:32 2010

# Wed May 26 19:04:30 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_ARCH_USES_GETTIMEOFFSET=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_NO_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y
@@ -34,6 +36,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set
@@ -179,9 +182,11 @@ CONFIG_MMU=y 
# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_VEXPRESS is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CNS3XXX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set
@@ -217,7 +222,7 @@ CONFIG_MMU=y 
CONFIG_ARCH_S3C64XX=y

# CONFIG_ARCH_S5P6440 is not set

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PC100 is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set
@@ -226,6 +231,7 @@ CONFIG_ARCH_S3C64XX=y 
# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_PLAT_SPEAR is not set

CONFIG_PLAT_SAMSUNG=y



#
@@ -251,7 +257,10 @@ CONFIG_S3C_DEV_I2C1=y 
CONFIG_S3C_DEV_FB=y

CONFIG_S3C_DEV_USB_HOST=y

CONFIG_S3C_DEV_USB_HSOTG=y

CONFIG_S3C_DEV_WDT=y

CONFIG_S3C_DEV_NAND=y

CONFIG_SAMSUNG_DEV_ADC=y

CONFIG_SAMSUNG_DEV_TS=y

CONFIG_S3C_DMA=y



#
@@ -260,6 +269,7 @@ CONFIG_S3C_DMA=y 
# CONFIG_SAMSUNG_PM_DEBUG is not set

# CONFIG_S3C_PM_DEBUG_LED_SMDK is not set

# CONFIG_SAMSUNG_PM_CHECK is not set

CONFIG_SAMSUNG_WAKEMASK=y

CONFIG_PLAT_S3C64XX=y

CONFIG_CPU_S3C6410=y

CONFIG_S3C64XX_DMA=y
@@ -277,6 +287,8 @@ CONFIG_SMDK6410_SD_CH0=y 
# CONFIG_SMDK6410_WM1192_EV1 is not set

# CONFIG_MACH_NCP is not set

# CONFIG_MACH_HMT is not set

# CONFIG_MACH_SMARTQ5 is not set

# CONFIG_MACH_SMARTQ7 is not set



#

# Processor Type
@@ -302,6 +314,7 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_DMA_MEM_BUFFERABLE=y

CONFIG_CPU_HAS_PMU=y

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_ARM_VIC=y
@@ -352,6 +365,7 @@ CONFIG_ALIGNMENT_TRAP=y 
CONFIG_ZBOOT_ROM_TEXT=0

CONFIG_ZBOOT_ROM_BSS=0

CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"

# CONFIG_CMDLINE_FORCE is not set

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -430,6 +444,7 @@ CONFIG_MTD=y 
# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set

# CONFIG_SM_FTL is not set

# CONFIG_MTD_OOPS is not set



#
@@ -472,9 +487,12 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_NAND=y

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

CONFIG_MTD_NAND_ECC=y

# CONFIG_MTD_NAND_ECC_SMC is not set

# CONFIG_MTD_NAND_VERIFY_WRITE is not set

# CONFIG_MTD_SM_COMMON is not set

# CONFIG_MTD_NAND_MUSEUM_IDS is not set

CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018

# CONFIG_MTD_NAND_GPIO is not set

CONFIG_MTD_NAND_IDS=y

CONFIG_MTD_NAND_S3C2410=y
@@ -569,6 +587,7 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_QT2160 is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_TCA6416 is not set

# CONFIG_KEYBOARD_MATRIX is not set

# CONFIG_KEYBOARD_MAX7359 is not set

# CONFIG_KEYBOARD_NEWTON is not set
@@ -638,6 +657,8 @@ CONFIG_SERIAL_S3C6400=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_ALTERA_JTAGUART is not set

# CONFIG_SERIAL_ALTERA_UART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -791,6 +812,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_LIS3_I2C is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set

CONFIG_HAVE_S3C2410_WATCHDOG=y

CONFIG_SSB_POSSIBLE=y



#
@@ -877,6 +899,7 @@ CONFIG_SND_SOC=m 
CONFIG_SND_SOC_AC97_BUS=y

CONFIG_SND_S3C24XX_SOC=m

CONFIG_SND_S3C_SOC_AC97=m

# CONFIG_SND_S3C64XX_SOC_WM8580 is not set

CONFIG_SND_SOC_SMDK_WM9713=m

CONFIG_SND_SOC_I2C_AND_SPI=m

# CONFIG_SND_SOC_ALL_CODECS is not set
@@ -936,10 +959,6 @@ CONFIG_RTC_LIB=y 
# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -1096,6 +1115,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set
@@ -1106,6 +1126,7 @@ CONFIG_BRANCH_PROFILE_NONE=y 
# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

arch/arm/configs/s5p6440_defconfig

+23 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.34

# Sat May 22 03:18:18 2010

# Wed May 26 19:04:32 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_ARCH_USES_GETTIMEOFFSET=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_NO_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y
@@ -33,6 +35,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set
@@ -178,9 +181,11 @@ CONFIG_MMU=y 
# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_VEXPRESS is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CNS3XXX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set
@@ -216,7 +221,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_S3C64XX is not set

CONFIG_ARCH_S5P6440=y

# CONFIG_ARCH_S5P6442 is not set

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PC100 is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set
@@ -225,6 +230,7 @@ CONFIG_ARCH_S5P6440=y 
# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_PLAT_SPEAR is not set

CONFIG_PLAT_SAMSUNG=y



#
@@ -240,10 +246,15 @@ CONFIG_SAMSUNG_GPIOLIB_4BIT=y 
CONFIG_S3C_GPIO_CFG_S3C24XX=y

CONFIG_S3C_GPIO_CFG_S3C64XX=y

CONFIG_S3C_GPIO_PULL_UPDOWN=y

CONFIG_S5P_GPIO_DRVSTR=y

CONFIG_SAMSUNG_GPIO_EXTRA=0

CONFIG_S3C_GPIO_SPACE=0

CONFIG_S3C_GPIO_TRACK=y

# CONFIG_S3C_ADC is not set

CONFIG_S3C_DEV_WDT=y

CONFIG_SAMSUNG_DEV_ADC=y

CONFIG_SAMSUNG_DEV_TS=y

CONFIG_S3C_PL330_DMA=y



#

# Power management
@@ -276,10 +287,12 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_DMA_MEM_BUFFERABLE=y

CONFIG_CPU_HAS_PMU=y

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_ARM_VIC=y

CONFIG_ARM_VIC_NR=2

CONFIG_PL330=y



#

# Bus support
@@ -326,6 +339,7 @@ CONFIG_ALIGNMENT_TRAP=y 
CONFIG_ZBOOT_ROM_TEXT=0

CONFIG_ZBOOT_ROM_BSS=0

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

# CONFIG_CMDLINE_FORCE is not set

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -490,7 +504,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y 
CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_DYNAPRO is not set

# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_S3C2410 is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
@@ -546,6 +562,8 @@ CONFIG_SERIAL_S3C6400=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_ALTERA_JTAGUART is not set

# CONFIG_SERIAL_ALTERA_UART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -593,6 +611,7 @@ CONFIG_GPIOLIB=y 
# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set

CONFIG_HAVE_S3C2410_WATCHDOG=y

CONFIG_SSB_POSSIBLE=y



#
@@ -649,10 +668,6 @@ CONFIG_RTC_LIB=y 
# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -850,6 +865,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set
@@ -860,6 +876,7 @@ CONFIG_BRANCH_PROFILE_NONE=y 
# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

arch/arm/configs/s5p6442_defconfig

+18 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.34

# Sat May 22 03:18:19 2010

# Wed May 26 19:04:34 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_ARCH_USES_GETTIMEOFFSET=y

CONFIG_HAVE_PROC_CPU=y

CONFIG_NO_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y
@@ -33,6 +35,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_HAVE_KERNEL_GZIP=y

CONFIG_HAVE_KERNEL_LZMA=y

CONFIG_HAVE_KERNEL_LZO=y

CONFIG_KERNEL_GZIP=y

# CONFIG_KERNEL_BZIP2 is not set
@@ -178,9 +181,11 @@ CONFIG_MMU=y 
# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_VEXPRESS is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CNS3XXX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set
@@ -216,7 +221,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_S5P6440 is not set

CONFIG_ARCH_S5P6442=y

# CONFIG_ARCH_S5PC1XX is not set

# CONFIG_ARCH_S5PC100 is not set

# CONFIG_ARCH_S5PV210 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set
@@ -225,6 +230,7 @@ CONFIG_ARCH_S5P6442=y 
# CONFIG_ARCH_NOMADIK is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_PLAT_SPEAR is not set

CONFIG_PLAT_SAMSUNG=y



#
@@ -240,10 +246,12 @@ CONFIG_SAMSUNG_GPIOLIB_4BIT=y 
CONFIG_S3C_GPIO_CFG_S3C24XX=y

CONFIG_S3C_GPIO_CFG_S3C64XX=y

CONFIG_S3C_GPIO_PULL_UPDOWN=y

CONFIG_S5P_GPIO_DRVSTR=y

CONFIG_SAMSUNG_GPIO_EXTRA=0

CONFIG_S3C_GPIO_SPACE=0

CONFIG_S3C_GPIO_TRACK=y

# CONFIG_S3C_ADC is not set

CONFIG_S3C_PL330_DMA=y



#

# Power management
@@ -276,10 +284,12 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_DMA_MEM_BUFFERABLE=y

CONFIG_CPU_HAS_PMU=y

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_ARM_VIC=y

CONFIG_ARM_VIC_NR=2

CONFIG_PL330=y



#

# Bus support
@@ -326,6 +336,7 @@ CONFIG_ALIGNMENT_TRAP=y 
CONFIG_ZBOOT_ROM_TEXT=0

CONFIG_ZBOOT_ROM_BSS=0

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

# CONFIG_CMDLINE_FORCE is not set

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -471,6 +482,7 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_DYNAPRO is not set

# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set
@@ -525,6 +537,8 @@ CONFIG_SERIAL_S5PV210=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_ALTERA_JTAGUART is not set

# CONFIG_SERIAL_ALTERA_UART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y
@@ -624,10 +638,6 @@ CONFIG_RTC_LIB=y 
# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -836,6 +846,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y 
CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set
@@ -846,6 +857,7 @@ CONFIG_BRANCH_PROFILE_NONE=y 
# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

arch/arm/configs/s5pc100_defconfig

+184 −49

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE