diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2012-03-20 23:48:03 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 16:41:35 -0400 |
commit | f3215b427bec2add8b5c776e8f50c3ba35b0e8f1 (patch) | |
tree | b477413742ceeb72f7fb01353163743c1ae2e072 /arch/arm/configs/spear6xx_defconfig | |
parent | 0b7ee71794b043de8a02d8887b69a57e4003106a (diff) |
SPEAr: Update defconfigs
Recently device tree support is added for SPEAr3xx & SPEAr6xx and we must
upgrade defconfig for that to get compiled. This patches does it.
There are few more rearrangements done in defconfig automatically, when i run
make savedefconfig.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Diffstat (limited to 'arch/arm/configs/spear6xx_defconfig')
-rw-r--r-- | arch/arm/configs/spear6xx_defconfig | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig index cef2e836afd2..cf94bc73a0e0 100644 --- a/arch/arm/configs/spear6xx_defconfig +++ b/arch/arm/configs/spear6xx_defconfig | |||
@@ -2,29 +2,58 @@ CONFIG_EXPERIMENTAL=y | |||
2 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
3 | CONFIG_BSD_PROCESS_ACCT=y | 3 | CONFIG_BSD_PROCESS_ACCT=y |
4 | CONFIG_BLK_DEV_INITRD=y | 4 | CONFIG_BLK_DEV_INITRD=y |
5 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
6 | CONFIG_MODULES=y | 5 | CONFIG_MODULES=y |
7 | CONFIG_MODULE_UNLOAD=y | 6 | CONFIG_MODULE_UNLOAD=y |
8 | CONFIG_MODVERSIONS=y | 7 | CONFIG_MODVERSIONS=y |
8 | CONFIG_PARTITION_ADVANCED=y | ||
9 | CONFIG_PLAT_SPEAR=y | 9 | CONFIG_PLAT_SPEAR=y |
10 | CONFIG_ARCH_SPEAR6XX=y | 10 | CONFIG_ARCH_SPEAR6XX=y |
11 | CONFIG_BOARD_SPEAR600_EVB=y | 11 | CONFIG_BOARD_SPEAR600_DT=y |
12 | CONFIG_BINFMT_MISC=y | 12 | CONFIG_BINFMT_MISC=y |
13 | CONFIG_NET=y | ||
13 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 14 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
15 | CONFIG_MTD=y | ||
16 | CONFIG_MTD_NAND=y | ||
17 | CONFIG_MTD_NAND_FSMC=y | ||
14 | CONFIG_BLK_DEV_RAM=y | 18 | CONFIG_BLK_DEV_RAM=y |
15 | CONFIG_BLK_DEV_RAM_SIZE=16384 | 19 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
20 | CONFIG_NETDEVICES=y | ||
21 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
22 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
23 | # CONFIG_NET_VENDOR_FARADAY is not set | ||
24 | # CONFIG_NET_VENDOR_INTEL is not set | ||
25 | # CONFIG_NET_VENDOR_MICREL is not set | ||
26 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
27 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
28 | # CONFIG_NET_VENDOR_SMSC is not set | ||
29 | CONFIG_STMMAC_ETH=y | ||
30 | # CONFIG_WLAN is not set | ||
16 | CONFIG_INPUT_FF_MEMLESS=y | 31 | CONFIG_INPUT_FF_MEMLESS=y |
17 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 32 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
33 | # CONFIG_INPUT_KEYBOARD is not set | ||
34 | # CONFIG_INPUT_MOUSE is not set | ||
35 | # CONFIG_LEGACY_PTYS is not set | ||
18 | CONFIG_SERIAL_AMBA_PL011=y | 36 | CONFIG_SERIAL_AMBA_PL011=y |
19 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 37 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
20 | # CONFIG_LEGACY_PTYS is not set | ||
21 | CONFIG_RAW_DRIVER=y | 38 | CONFIG_RAW_DRIVER=y |
22 | CONFIG_MAX_RAW_DEVS=8192 | 39 | CONFIG_MAX_RAW_DEVS=8192 |
40 | CONFIG_I2C=y | ||
41 | CONFIG_I2C_DESIGNWARE_PLATFORM=y | ||
42 | CONFIG_SPI=y | ||
43 | CONFIG_SPI_PL022=y | ||
23 | CONFIG_GPIO_SYSFS=y | 44 | CONFIG_GPIO_SYSFS=y |
24 | CONFIG_GPIO_PL061=y | 45 | CONFIG_GPIO_PL061=y |
25 | # CONFIG_HWMON is not set | 46 | # CONFIG_HWMON is not set |
47 | CONFIG_WATCHDOG=y | ||
48 | CONFIG_ARM_SP805_WATCHDOG=y | ||
26 | # CONFIG_HID_SUPPORT is not set | 49 | # CONFIG_HID_SUPPORT is not set |
27 | # CONFIG_USB_SUPPORT is not set | 50 | CONFIG_USB=y |
51 | CONFIG_USB_EHCI_HCD=y | ||
52 | CONFIG_USB_OHCI_HCD=y | ||
53 | CONFIG_RTC_CLASS=y | ||
54 | CONFIG_DMADEVICES=y | ||
55 | CONFIG_AMBA_PL08X=y | ||
56 | CONFIG_DMATEST=m | ||
28 | CONFIG_EXT2_FS=y | 57 | CONFIG_EXT2_FS=y |
29 | CONFIG_EXT2_FS_XATTR=y | 58 | CONFIG_EXT2_FS_XATTR=y |
30 | CONFIG_EXT2_FS_SECURITY=y | 59 | CONFIG_EXT2_FS_SECURITY=y |
@@ -35,8 +64,6 @@ CONFIG_MSDOS_FS=m | |||
35 | CONFIG_VFAT_FS=m | 64 | CONFIG_VFAT_FS=m |
36 | CONFIG_FAT_DEFAULT_IOCHARSET="ascii" | 65 | CONFIG_FAT_DEFAULT_IOCHARSET="ascii" |
37 | CONFIG_TMPFS=y | 66 | CONFIG_TMPFS=y |
38 | CONFIG_PARTITION_ADVANCED=y | ||
39 | CONFIG_NLS=y | ||
40 | CONFIG_NLS_DEFAULT="utf8" | 67 | CONFIG_NLS_DEFAULT="utf8" |
41 | CONFIG_NLS_CODEPAGE_437=y | 68 | CONFIG_NLS_CODEPAGE_437=y |
42 | CONFIG_NLS_ASCII=m | 69 | CONFIG_NLS_ASCII=m |
@@ -44,6 +71,4 @@ CONFIG_MAGIC_SYSRQ=y | |||
44 | CONFIG_DEBUG_FS=y | 71 | CONFIG_DEBUG_FS=y |
45 | CONFIG_DEBUG_KERNEL=y | 72 | CONFIG_DEBUG_KERNEL=y |
46 | CONFIG_DEBUG_SPINLOCK=y | 73 | CONFIG_DEBUG_SPINLOCK=y |
47 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
48 | CONFIG_DEBUG_INFO=y | 74 | CONFIG_DEBUG_INFO=y |
49 | # CONFIG_CRC32 is not set | ||