diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-01-15 15:29:10 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-15 18:49:55 -0500 |
commit | baf41b32d8d89824d257d52e472f8fd71be18872 (patch) | |
tree | 3f86ef27f317799714f9a29d0e7e0baee397ff04 /arch/arm/configs | |
parent | 5fe16c9d978f134183355acf1cdfaee3d3e87547 (diff) |
ARM: efm32: update defconfig
Enable i2c driver for efm32. The other two changes are just results from
oldconfig after commits
- 08b964ff3c51 (ARM: 8198/1: make kuser helpers depend on MMU)
- 8357041a69b3 (of: remove /proc/device-tree)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/efm32_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index f59fffb3d0c6..c4c17e3a8e1a 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_EMBEDDED=y | |||
17 | # CONFIG_IOSCHED_CFQ is not set | 17 | # CONFIG_IOSCHED_CFQ is not set |
18 | # CONFIG_MMU is not set | 18 | # CONFIG_MMU is not set |
19 | CONFIG_ARCH_EFM32=y | 19 | CONFIG_ARCH_EFM32=y |
20 | # CONFIG_KUSER_HELPERS is not set | ||
21 | CONFIG_SET_MEM_PARAM=y | 20 | CONFIG_SET_MEM_PARAM=y |
22 | CONFIG_DRAM_BASE=0x88000000 | 21 | CONFIG_DRAM_BASE=0x88000000 |
23 | CONFIG_DRAM_SIZE=0x00400000 | 22 | CONFIG_DRAM_SIZE=0x00400000 |
@@ -49,7 +48,6 @@ CONFIG_MTD=y | |||
49 | CONFIG_MTD_BLOCK_RO=y | 48 | CONFIG_MTD_BLOCK_RO=y |
50 | CONFIG_MTD_ROM=y | 49 | CONFIG_MTD_ROM=y |
51 | CONFIG_MTD_UCLINUX=y | 50 | CONFIG_MTD_UCLINUX=y |
52 | CONFIG_PROC_DEVICETREE=y | ||
53 | # CONFIG_BLK_DEV is not set | 51 | # CONFIG_BLK_DEV is not set |
54 | CONFIG_NETDEVICES=y | 52 | CONFIG_NETDEVICES=y |
55 | # CONFIG_NET_VENDOR_ARC is not set | 53 | # CONFIG_NET_VENDOR_ARC is not set |
@@ -78,6 +76,9 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
78 | CONFIG_SERIAL_EFM32_UART=y | 76 | CONFIG_SERIAL_EFM32_UART=y |
79 | CONFIG_SERIAL_EFM32_UART_CONSOLE=y | 77 | CONFIG_SERIAL_EFM32_UART_CONSOLE=y |
80 | # CONFIG_HW_RANDOM is not set | 78 | # CONFIG_HW_RANDOM is not set |
79 | CONFIG_I2C=y | ||
80 | # CONFIG_I2C_COMPAT is not set | ||
81 | CONFIG_I2C_EFM32=y | ||
81 | CONFIG_SPI=y | 82 | CONFIG_SPI=y |
82 | CONFIG_SPI_EFM32=y | 83 | CONFIG_SPI_EFM32=y |
83 | CONFIG_GPIO_SYSFS=y | 84 | CONFIG_GPIO_SYSFS=y |