diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-09-06 04:16:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 05:02:25 -0400 |
commit | 6a7d520fc141ad8f72efab3a5a2a73b3655fee24 (patch) | |
tree | 6b25c233a72615f6c878d6556ad0fccbdfb0356e /arch/arm/configs | |
parent | 74b0ec0708e7c8c530079b737f32c55597d062cc (diff) |
ARM: 6365/1: Update RealView defconfig
This patches the condensed RealView defconfig activating some
stuff that has been missing from this config for some time and
some stuff that was merged in the 2.6.36 merge window:
- The new character LCD driver is enabled
- The Versatile I2C is enabled
- The PL022 SPI driver is enabled
- gpiolib is enabled (and makes MMC detection work properly)
- The new LEDs code is enabled with a heartbeat trigger
- The RTC class is enabled, and the PL031 RTC (onchip) and
the offchip DS1307 on I2C is enabled
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/realview_defconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index fb75192ee7e5..fcaa60328051 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig | |||
@@ -38,6 +38,7 @@ CONFIG_MTD_CFI=y | |||
38 | CONFIG_MTD_CFI_INTELEXT=y | 38 | CONFIG_MTD_CFI_INTELEXT=y |
39 | CONFIG_MTD_CFI_AMDSTD=y | 39 | CONFIG_MTD_CFI_AMDSTD=y |
40 | CONFIG_MTD_ARM_INTEGRATOR=y | 40 | CONFIG_MTD_ARM_INTEGRATOR=y |
41 | CONFIG_ARM_CHARLCD=y | ||
41 | CONFIG_NETDEVICES=y | 42 | CONFIG_NETDEVICES=y |
42 | CONFIG_SMSC_PHY=y | 43 | CONFIG_SMSC_PHY=y |
43 | CONFIG_NET_ETHERNET=y | 44 | CONFIG_NET_ETHERNET=y |
@@ -51,10 +52,13 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
51 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 52 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
52 | CONFIG_LEGACY_PTY_COUNT=16 | 53 | CONFIG_LEGACY_PTY_COUNT=16 |
53 | # CONFIG_HW_RANDOM is not set | 54 | # CONFIG_HW_RANDOM is not set |
55 | CONFIG_I2C=y | ||
56 | CONFIG_I2C_VERSATILE=y | ||
57 | CONFIG_SPI=y | ||
58 | CONFIG_GPIOLIB=y | ||
54 | # CONFIG_HWMON is not set | 59 | # CONFIG_HWMON is not set |
55 | CONFIG_FB=y | 60 | CONFIG_FB=y |
56 | CONFIG_FB_ARMCLCD=y | 61 | CONFIG_FB_ARMCLCD=y |
57 | # CONFIG_VGA_CONSOLE is not set | ||
58 | CONFIG_FRAMEBUFFER_CONSOLE=y | 62 | CONFIG_FRAMEBUFFER_CONSOLE=y |
59 | CONFIG_LOGO=y | 63 | CONFIG_LOGO=y |
60 | # CONFIG_LOGO_LINUX_MONO is not set | 64 | # CONFIG_LOGO_LINUX_MONO is not set |
@@ -69,7 +73,13 @@ CONFIG_SND_ARMAACI=y | |||
69 | # CONFIG_USB_SUPPORT is not set | 73 | # CONFIG_USB_SUPPORT is not set |
70 | CONFIG_MMC=y | 74 | CONFIG_MMC=y |
71 | CONFIG_MMC_ARMMMCI=y | 75 | CONFIG_MMC_ARMMMCI=y |
72 | CONFIG_INOTIFY=y | 76 | CONFIG_NEW_LEDS=y |
77 | CONFIG_LEDS_CLASS=y | ||
78 | CONFIG_LEDS_TRIGGERS=y | ||
79 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
80 | CONFIG_RTC_CLASS=y | ||
81 | CONFIG_RTC_DRV_DS1307=y | ||
82 | CONFIG_RTC_DRV_PL031=y | ||
73 | CONFIG_VFAT_FS=y | 83 | CONFIG_VFAT_FS=y |
74 | CONFIG_TMPFS=y | 84 | CONFIG_TMPFS=y |
75 | CONFIG_CRAMFS=y | 85 | CONFIG_CRAMFS=y |
@@ -79,6 +89,7 @@ CONFIG_ROOT_NFS=y | |||
79 | CONFIG_NLS_CODEPAGE_437=y | 89 | CONFIG_NLS_CODEPAGE_437=y |
80 | CONFIG_NLS_ISO8859_1=y | 90 | CONFIG_NLS_ISO8859_1=y |
81 | CONFIG_MAGIC_SYSRQ=y | 91 | CONFIG_MAGIC_SYSRQ=y |
92 | CONFIG_DEBUG_FS=y | ||
82 | CONFIG_DEBUG_KERNEL=y | 93 | CONFIG_DEBUG_KERNEL=y |
83 | # CONFIG_SCHED_DEBUG is not set | 94 | # CONFIG_SCHED_DEBUG is not set |
84 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 95 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |