brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0096-config-enable-BLK_DEV_SD-statically.-Add-some-DM_MIR.patch
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
6
7 kernel: config: add missing PPP config options
8
9 kernel: config: Add MMC_SPI and DM_LOG_USERSPACE
10
11 kernel: config: Add crypto modules
12
13 config: Enable NET_IPIP, IP_ADVANCED_ROUTER, IP_MULTIPLE_TABLES, IP_ROUTE_MULTIPATH, NETFILTER_MATCH_IPVS
14
15 config: Enable MROUTE options
16
17 config: enable CONFIG_CRYPTO_AES_ARM
18
19 config: Add more config options from 3.6 tree including PREEMPT, SPEAKUP, NTFS_RW, HFS
20
21 config: Set CONFIG_SPI_SPIDEV=y
22 ---
23  arch/arm/configs/bcmrpi_defconfig | 93 +++++++++++++++++++++++++++++++++------
24  1 file changed, 80 insertions(+), 13 deletions(-)
25
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
32  CONFIG_MODVERSIONS=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
39  CONFIG_ARCH_BCM2708=y
40 +CONFIG_PREEMPT=y
41  CONFIG_AEABI=y
42 +CONFIG_CLEANCACHE=y
43 +CONFIG_FRONTSWAP=y
44 +CONFIG_UACCESS_WITH_MEMCPY=y
45  CONFIG_SECCOMP=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"
51  CONFIG_KEXEC=y
52  CONFIG_CPU_FREQ=y
53  CONFIG_CPU_FREQ_STAT=m
54 @@ -64,9 +67,20 @@ CONFIG_XFRM_USER=y
55  CONFIG_NET_KEY=m
56  CONFIG_INET=y
57  CONFIG_IP_MULTICAST=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
62  CONFIG_IP_PNP=y
63  CONFIG_IP_PNP_DHCP=y
64  CONFIG_IP_PNP_RARP=y
65 +CONFIG_NET_IPIP=m
66 +CONFIG_NET_IPGRE_DEMUX=m
67 +CONFIG_NET_IPGRE=m
68 +CONFIG_IP_MROUTE=y
69 +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
70 +CONFIG_IP_PIMSM_V1=y
71 +CONFIG_IP_PIMSM_V2=y
72  CONFIG_SYN_COOKIES=y
73  CONFIG_INET_AH=m
74  CONFIG_INET_ESP=m
75 @@ -81,6 +95,9 @@ CONFIG_INET6_AH=m
76  CONFIG_INET6_ESP=m
77  CONFIG_INET6_IPCOMP=m
78  CONFIG_IPV6_MULTIPLE_TABLES=y
79 +CONFIG_IPV6_MROUTE=y
80 +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
81 +CONFIG_IPV6_PIMSM_V2=y
82  CONFIG_NETFILTER=y
83  CONFIG_NF_CONNTRACK=m
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
94  CONFIG_NET_9P=m
95  CONFIG_NFC=m
96  CONFIG_NFC_PN533=m
97 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
98  CONFIG_DEVTMPFS=y
99  CONFIG_DEVTMPFS_MOUNT=y
100  CONFIG_CMA=y
101 @@ -369,25 +386,44 @@ CONFIG_BLK_DEV_RAM=y
102  CONFIG_CDROM_PKTCDVD=m
103  CONFIG_SCSI=y
104  # CONFIG_SCSI_PROC_FS is not set
105 -CONFIG_BLK_DEV_SD=m
106 +CONFIG_BLK_DEV_SD=y
107 +CONFIG_CHR_DEV_ST=m
108 +CONFIG_CHR_DEV_OSST=m
109  CONFIG_BLK_DEV_SR=m
110  CONFIG_SCSI_MULTI_LUN=y
111 -# CONFIG_SCSI_LOWLEVEL is not set
112 +CONFIG_SCSI_ISCSI_ATTRS=y
113 +CONFIG_ISCSI_TCP=m
114 +CONFIG_ISCSI_BOOT_SYSFS=m
115  CONFIG_MD=y
116 +CONFIG_MD_RAID0=m
117  CONFIG_BLK_DEV_DM=m
118  CONFIG_DM_CRYPT=m
119 +CONFIG_DM_SNAPSHOT=m
120 +CONFIG_DM_MIRROR=m
121 +CONFIG_DM_RAID=m
122 +CONFIG_DM_LOG_USERSPACE=m
123 +CONFIG_DM_ZERO=m
124 +CONFIG_DM_DELAY=m
125  CONFIG_NETDEVICES=y
126 +CONFIG_BONDING=m
127  CONFIG_DUMMY=m
128 +CONFIG_MACVLAN=m
129  CONFIG_NETCONSOLE=m
130  CONFIG_TUN=m
131  CONFIG_MDIO_BITBANG=m
132  CONFIG_PPP=m
133  CONFIG_PPP_BSDCOMP=m
134  CONFIG_PPP_DEFLATE=m
135 +CONFIG_PPP_FILTER=y
136 +CONFIG_PPP_MPPE=m
137 +CONFIG_PPP_MULTILINK=y
138 +CONFIG_PPPOE=m
139 +CONFIG_PPPOL2TP=m
140  CONFIG_PPP_ASYNC=m
141  CONFIG_PPP_SYNC_TTY=m
142  CONFIG_SLIP=m
143  CONFIG_SLIP_COMPRESSED=y
144 +CONFIG_SLIP_SMART=y
145  CONFIG_USB_CATC=m
146  CONFIG_USB_KAWETH=m
147  CONFIG_USB_PEGASUS=m
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
161 +CONFIG_SERIO=m
162 +CONFIG_SERIO_RAW=m
163 +CONFIG_GAMEPORT=m
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
171 +CONFIG_TTY_PRINTK=y
172  CONFIG_HW_RANDOM=y
173 -CONFIG_HW_RANDOM_BCM2708=y
174 +CONFIG_HW_RANDOM_BCM2708=m
175  CONFIG_RAW_DRIVER=y
176  CONFIG_BRCM_CHAR_DRIVERS=y
177  CONFIG_BCM_VC_CMA=y
178 @@ -489,7 +531,7 @@ CONFIG_I2C_CHARDEV=m
179  CONFIG_I2C_BCM2708=m
180  CONFIG_SPI=y
181  CONFIG_SPI_BCM2708=m
182 -CONFIG_SPI_SPIDEV=m
183 +CONFIG_SPI_SPIDEV=y
184  CONFIG_GPIO_SYSFS=y
185  CONFIG_W1=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
190  CONFIG_USB_SI470X=m
191 +CONFIG_I2C_SI470X=m
192  CONFIG_USB_MR800=m
193  CONFIG_USB_DSBR=m
194  CONFIG_RADIO_SHARK=m
195 @@ -652,11 +695,14 @@ CONFIG_RADIO_SHARK2=m
196  CONFIG_RADIO_SI4713=m
197  CONFIG_USB_KEENE=m
198  CONFIG_USB_MA901=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
204  CONFIG_FB=y
205  CONFIG_FB_BCM2708=y
206 +# CONFIG_BACKLIGHT_GENERIC is not set
207  CONFIG_FRAMEBUFFER_CONSOLE=y
208  CONFIG_LOGO=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
216  CONFIG_SOUND_PRIME=m
217  CONFIG_HIDRAW=y
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
222 +CONFIG_MMC_SPI=m
223  CONFIG_LEDS_GPIO=m
224  CONFIG_LEDS_TRIGGER_TIMER=y
225  CONFIG_LEDS_TRIGGER_ONESHOT=y
226 @@ -874,9 +922,20 @@ CONFIG_UIO=m
227  CONFIG_UIO_PDRV=m
228  CONFIG_UIO_PDRV_GENIRQ=m
229  CONFIG_STAGING=y
230 +CONFIG_W35UND=m
231 +CONFIG_PRISM2_USB=m
232 +CONFIG_R8712U=m
233 +CONFIG_VT6656=m
234 +CONFIG_SPEAKUP=m
235 +CONFIG_SPEAKUP_SYNTH_SOFT=m
236  CONFIG_STAGING_MEDIA=y
237 +CONFIG_DVB_AS102=m
238  CONFIG_LIRC_STAGING=y
239 +CONFIG_LIRC_IGORPLUGUSB=m
240 +CONFIG_LIRC_IMON=m
241  CONFIG_LIRC_RPI=m
242 +CONFIG_LIRC_SASEM=m
243 +CONFIG_LIRC_SERIAL=m
244  # CONFIG_IOMMU_SUPPORT is not set
245  CONFIG_EXT4_FS=y
246  CONFIG_EXT4_FS_POSIX_ACL=y
247 @@ -916,9 +975,13 @@ CONFIG_MSDOS_FS=y
248  CONFIG_VFAT_FS=y
249  CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
250  CONFIG_NTFS_FS=m
251 +CONFIG_NTFS_RW=y
252  CONFIG_TMPFS=y
253  CONFIG_TMPFS_POSIX_ACL=y
254  CONFIG_CONFIGFS_FS=y
255 +CONFIG_ECRYPT_FS=m
256 +CONFIG_HFS_FS=m
257 +CONFIG_HFSPLUS_FS=m
258  CONFIG_SQUASHFS=m
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
263  CONFIG_CIFS_XATTR=y
264  CONFIG_CIFS_POSIX=y
265 -# CONFIG_CIFS_DEBUG is not set
266  CONFIG_9P_FS=m
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
271  CONFIG_NLS_KOI8_R=m
272  CONFIG_NLS_KOI8_U=m
273 -CONFIG_NLS_UTF8=m
274  CONFIG_DLM=m
275  CONFIG_PRINTK_TIME=y
276 +CONFIG_DEBUG_FS=y
277  CONFIG_DETECT_HUNG_TASK=y
278  CONFIG_TIMER_STATS=y
279 +# CONFIG_DEBUG_PREEMPT is not set
280  CONFIG_DEBUG_MEMORY_INIT=y
281  CONFIG_BOOT_PRINTK_DELAY=y
282  CONFIG_LATENCYTOP=y
283 +# CONFIG_KPROBE_EVENT is not set
284  CONFIG_KGDB=y
285  CONFIG_KGDB_KDB=y
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
292  CONFIG_CRYPTO_CBC=y
293 -CONFIG_CRYPTO_HMAC=y
294 +CONFIG_CRYPTO_XTS=m
295  CONFIG_CRYPTO_XCBC=m
296 -CONFIG_CRYPTO_MD5=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
304  CONFIG_CRYPTO_DES=y
305  # CONFIG_CRYPTO_ANSI_CPRNG is not set
306 -- 
307 1.9.1
308