1 From f4ae99bfa423d21fa311ca21c360e9800dc86fb5 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Wed, 6 Nov 2013 12:08:46 +0000
4 Subject: [PATCH 096/196] config: enable BLK_DEV_SD statically. Add some
5 DM_MIRROR raid options. Add ISCSI_TCP. Add R8712U
7 kernel: config: add missing PPP config options
9 kernel: config: Add MMC_SPI and DM_LOG_USERSPACE
11 kernel: config: Add crypto modules
13 config: Enable NET_IPIP, IP_ADVANCED_ROUTER, IP_MULTIPLE_TABLES, IP_ROUTE_MULTIPATH, NETFILTER_MATCH_IPVS
15 config: Enable MROUTE options
17 config: enable CONFIG_CRYPTO_AES_ARM
19 config: Add more config options from 3.6 tree including PREEMPT, SPEAKUP, NTFS_RW, HFS
21 config: Set CONFIG_SPI_SPIDEV=y
23 arch/arm/configs/bcmrpi_defconfig | 93 +++++++++++++++++++++++++++++++++------
24 1 file changed, 80 insertions(+), 13 deletions(-)
26 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
27 index 36fcd49..20c1c4f 100644
28 --- a/arch/arm/configs/bcmrpi_defconfig
29 +++ b/arch/arm/configs/bcmrpi_defconfig
30 @@ -33,18 +33,21 @@ CONFIG_MODULES=y
31 CONFIG_MODULE_UNLOAD=y
33 CONFIG_MODULE_SRCVERSION_ALL=y
34 -# CONFIG_BLK_DEV_BSG is not set
35 CONFIG_BLK_DEV_THROTTLING=y
36 CONFIG_PARTITION_ADVANCED=y
37 CONFIG_MAC_PARTITION=y
38 CONFIG_CFQ_GROUP_IOSCHED=y
44 +CONFIG_UACCESS_WITH_MEMCPY=y
46 CONFIG_CC_STACKPROTECTOR=y
47 CONFIG_ZBOOT_ROM_TEXT=0x0
48 CONFIG_ZBOOT_ROM_BSS=0x0
49 -CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
50 +CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
53 CONFIG_CPU_FREQ_STAT=m
54 @@ -64,9 +67,20 @@ CONFIG_XFRM_USER=y
58 +CONFIG_IP_ADVANCED_ROUTER=y
59 +CONFIG_IP_MULTIPLE_TABLES=y
60 +CONFIG_IP_ROUTE_MULTIPATH=y
61 +CONFIG_IP_ROUTE_VERBOSE=y
66 +CONFIG_NET_IPGRE_DEMUX=m
69 +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
75 @@ -81,6 +95,9 @@ CONFIG_INET6_AH=m
78 CONFIG_IPV6_MULTIPLE_TABLES=y
80 +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
81 +CONFIG_IPV6_PIMSM_V2=y
84 CONFIG_NF_CONNTRACK_ZONES=y
85 @@ -136,6 +153,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
86 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
87 CONFIG_NETFILTER_XT_MATCH_HELPER=m
88 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
89 +CONFIG_NETFILTER_XT_MATCH_IPVS=m
90 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
91 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
92 CONFIG_NETFILTER_XT_MATCH_MAC=m
93 @@ -357,7 +375,6 @@ CONFIG_RFKILL_INPUT=y
97 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
99 CONFIG_DEVTMPFS_MOUNT=y
101 @@ -369,25 +386,44 @@ CONFIG_BLK_DEV_RAM=y
102 CONFIG_CDROM_PKTCDVD=m
104 # CONFIG_SCSI_PROC_FS is not set
108 +CONFIG_CHR_DEV_OSST=m
110 CONFIG_SCSI_MULTI_LUN=y
111 -# CONFIG_SCSI_LOWLEVEL is not set
112 +CONFIG_SCSI_ISCSI_ATTRS=y
114 +CONFIG_ISCSI_BOOT_SYSFS=m
119 +CONFIG_DM_SNAPSHOT=m
122 +CONFIG_DM_LOG_USERSPACE=m
131 CONFIG_MDIO_BITBANG=m
137 +CONFIG_PPP_MULTILINK=y
141 CONFIG_PPP_SYNC_TTY=m
143 CONFIG_SLIP_COMPRESSED=y
148 @@ -397,6 +433,7 @@ CONFIG_USB_USBNET=y
149 CONFIG_USB_NET_AX8817X=m
150 CONFIG_USB_NET_CDCETHER=m
151 CONFIG_USB_NET_CDC_EEM=m
152 +CONFIG_USB_NET_CDC_NCM=m
153 CONFIG_USB_NET_CDC_MBIM=m
154 CONFIG_USB_NET_DM9601=m
155 CONFIG_USB_NET_SMSC75XX=m
156 @@ -473,14 +510,19 @@ CONFIG_INPUT_UINPUT=m
157 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
158 CONFIG_INPUT_ADXL34X=m
159 CONFIG_INPUT_CMA3000=m
160 -# CONFIG_SERIO is not set
164 +CONFIG_GAMEPORT_NS558=m
165 +CONFIG_GAMEPORT_L4=m
166 CONFIG_VT_HW_CONSOLE_BINDING=y
167 # CONFIG_LEGACY_PTYS is not set
168 # CONFIG_DEVKMEM is not set
169 CONFIG_SERIAL_AMBA_PL011=y
170 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
173 -CONFIG_HW_RANDOM_BCM2708=y
174 +CONFIG_HW_RANDOM_BCM2708=m
176 CONFIG_BRCM_CHAR_DRIVERS=y
178 @@ -489,7 +531,7 @@ CONFIG_I2C_CHARDEV=m
186 CONFIG_W1_MASTER_DS2490=m
187 @@ -645,6 +687,7 @@ CONFIG_VIDEO_EM28XX_ALSA=m
188 CONFIG_VIDEO_EM28XX_DVB=m
189 CONFIG_RADIO_SI470X=y
195 @@ -652,11 +695,14 @@ CONFIG_RADIO_SHARK2=m
196 CONFIG_RADIO_SI4713=m
199 +CONFIG_RADIO_TEA5764=m
200 CONFIG_RADIO_SAA7706H=m
201 CONFIG_RADIO_TEF6862=m
202 +CONFIG_RADIO_WL1273=m
203 CONFIG_RADIO_WL128X=m
206 +# CONFIG_BACKLIGHT_GENERIC is not set
207 CONFIG_FRAMEBUFFER_CONSOLE=y
209 # CONFIG_LOGO_LINUX_MONO is not set
210 @@ -679,6 +725,7 @@ CONFIG_SND_BCM2835=m
211 CONFIG_SND_USB_AUDIO=m
212 CONFIG_SND_USB_UA101=m
213 CONFIG_SND_USB_CAIAQ=m
214 +CONFIG_SND_USB_CAIAQ_INPUT=y
215 CONFIG_SND_USB_6FIRE=m
218 @@ -829,6 +876,7 @@ CONFIG_MMC_SDHCI=y
219 CONFIG_MMC_SDHCI_PLTFM=y
220 CONFIG_MMC_SDHCI_BCM2708=y
221 CONFIG_MMC_SDHCI_BCM2708_DMA=y
224 CONFIG_LEDS_TRIGGER_TIMER=y
225 CONFIG_LEDS_TRIGGER_ONESHOT=y
226 @@ -874,9 +922,20 @@ CONFIG_UIO=m
228 CONFIG_UIO_PDRV_GENIRQ=m
235 +CONFIG_SPEAKUP_SYNTH_SOFT=m
236 CONFIG_STAGING_MEDIA=y
238 CONFIG_LIRC_STAGING=y
239 +CONFIG_LIRC_IGORPLUGUSB=m
243 +CONFIG_LIRC_SERIAL=m
244 # CONFIG_IOMMU_SUPPORT is not set
246 CONFIG_EXT4_FS_POSIX_ACL=y
247 @@ -916,9 +975,13 @@ CONFIG_MSDOS_FS=y
249 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
253 CONFIG_TMPFS_POSIX_ACL=y
259 CONFIG_SQUASHFS_XATTR=y
260 CONFIG_SQUASHFS_LZO=y
261 @@ -936,7 +999,6 @@ CONFIG_CIFS=m
262 CONFIG_CIFS_WEAK_PW_HASH=y
265 -# CONFIG_CIFS_DEBUG is not set
267 CONFIG_9P_FS_POSIX_ACL=y
268 CONFIG_NLS_DEFAULT="utf8"
269 @@ -977,27 +1039,32 @@ CONFIG_NLS_ISO8859_14=m
270 CONFIG_NLS_ISO8859_15=m
277 CONFIG_DETECT_HUNG_TASK=y
279 +# CONFIG_DEBUG_PREEMPT is not set
280 CONFIG_DEBUG_MEMORY_INIT=y
281 CONFIG_BOOT_PRINTK_DELAY=y
283 +# CONFIG_KPROBE_EVENT is not set
286 CONFIG_KDB_KEYBOARD=y
287 CONFIG_STRICT_DEVMEM=y
288 +CONFIG_CRYPTO_USER=m
289 +CONFIG_CRYPTO_NULL=m
290 +CONFIG_CRYPTO_CRYPTD=m
291 CONFIG_CRYPTO_SEQIV=m
293 -CONFIG_CRYPTO_HMAC=y
297 -CONFIG_CRYPTO_SHA1=y
298 +CONFIG_CRYPTO_SHA1_ARM=m
299 CONFIG_CRYPTO_SHA512=m
300 CONFIG_CRYPTO_TGR192=m
301 CONFIG_CRYPTO_WP512=m
302 +CONFIG_CRYPTO_AES_ARM=m
303 CONFIG_CRYPTO_CAST5=m
305 # CONFIG_CRYPTO_ANSI_CPRNG is not set