brcm2708: update against latest rpi-3.10.y branch
[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0096-config-enable-BLK_DEV_SD-statically.-Add-some-DM_MIR.patch
1 From 062e7d1247624034c6b9ff1515245930baee8862 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/174] 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 --- a/arch/arm/configs/bcmrpi_defconfig
27 +++ b/arch/arm/configs/bcmrpi_defconfig
28 @@ -33,18 +33,21 @@ CONFIG_MODULES=y
29  CONFIG_MODULE_UNLOAD=y
30  CONFIG_MODVERSIONS=y
31  CONFIG_MODULE_SRCVERSION_ALL=y
32 -# CONFIG_BLK_DEV_BSG is not set
33  CONFIG_BLK_DEV_THROTTLING=y
34  CONFIG_PARTITION_ADVANCED=y
35  CONFIG_MAC_PARTITION=y
36  CONFIG_CFQ_GROUP_IOSCHED=y
37  CONFIG_ARCH_BCM2708=y
38 +CONFIG_PREEMPT=y
39  CONFIG_AEABI=y
40 +CONFIG_CLEANCACHE=y
41 +CONFIG_FRONTSWAP=y
42 +CONFIG_UACCESS_WITH_MEMCPY=y
43  CONFIG_SECCOMP=y
44  CONFIG_CC_STACKPROTECTOR=y
45  CONFIG_ZBOOT_ROM_TEXT=0x0
46  CONFIG_ZBOOT_ROM_BSS=0x0
47 -CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
48 +CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
49  CONFIG_KEXEC=y
50  CONFIG_CPU_FREQ=y
51  CONFIG_CPU_FREQ_STAT=m
52 @@ -64,9 +67,20 @@ CONFIG_XFRM_USER=y
53  CONFIG_NET_KEY=m
54  CONFIG_INET=y
55  CONFIG_IP_MULTICAST=y
56 +CONFIG_IP_ADVANCED_ROUTER=y
57 +CONFIG_IP_MULTIPLE_TABLES=y
58 +CONFIG_IP_ROUTE_MULTIPATH=y
59 +CONFIG_IP_ROUTE_VERBOSE=y
60  CONFIG_IP_PNP=y
61  CONFIG_IP_PNP_DHCP=y
62  CONFIG_IP_PNP_RARP=y
63 +CONFIG_NET_IPIP=m
64 +CONFIG_NET_IPGRE_DEMUX=m
65 +CONFIG_NET_IPGRE=m
66 +CONFIG_IP_MROUTE=y
67 +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
68 +CONFIG_IP_PIMSM_V1=y
69 +CONFIG_IP_PIMSM_V2=y
70  CONFIG_SYN_COOKIES=y
71  CONFIG_INET_AH=m
72  CONFIG_INET_ESP=m
73 @@ -81,6 +95,9 @@ CONFIG_INET6_AH=m
74  CONFIG_INET6_ESP=m
75  CONFIG_INET6_IPCOMP=m
76  CONFIG_IPV6_MULTIPLE_TABLES=y
77 +CONFIG_IPV6_MROUTE=y
78 +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
79 +CONFIG_IPV6_PIMSM_V2=y
80  CONFIG_NETFILTER=y
81  CONFIG_NF_CONNTRACK=m
82  CONFIG_NF_CONNTRACK_ZONES=y
83 @@ -136,6 +153,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
84  CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
85  CONFIG_NETFILTER_XT_MATCH_HELPER=m
86  CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
87 +CONFIG_NETFILTER_XT_MATCH_IPVS=m
88  CONFIG_NETFILTER_XT_MATCH_LENGTH=m
89  CONFIG_NETFILTER_XT_MATCH_LIMIT=m
90  CONFIG_NETFILTER_XT_MATCH_MAC=m
91 @@ -357,7 +375,6 @@ CONFIG_RFKILL_INPUT=y
92  CONFIG_NET_9P=m
93  CONFIG_NFC=m
94  CONFIG_NFC_PN533=m
95 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
96  CONFIG_DEVTMPFS=y
97  CONFIG_DEVTMPFS_MOUNT=y
98  CONFIG_CMA=y
99 @@ -369,25 +386,44 @@ CONFIG_BLK_DEV_RAM=y
100  CONFIG_CDROM_PKTCDVD=m
101  CONFIG_SCSI=y
102  # CONFIG_SCSI_PROC_FS is not set
103 -CONFIG_BLK_DEV_SD=m
104 +CONFIG_BLK_DEV_SD=y
105 +CONFIG_CHR_DEV_ST=m
106 +CONFIG_CHR_DEV_OSST=m
107  CONFIG_BLK_DEV_SR=m
108  CONFIG_SCSI_MULTI_LUN=y
109 -# CONFIG_SCSI_LOWLEVEL is not set
110 +CONFIG_SCSI_ISCSI_ATTRS=y
111 +CONFIG_ISCSI_TCP=m
112 +CONFIG_ISCSI_BOOT_SYSFS=m
113  CONFIG_MD=y
114 +CONFIG_MD_RAID0=m
115  CONFIG_BLK_DEV_DM=m
116  CONFIG_DM_CRYPT=m
117 +CONFIG_DM_SNAPSHOT=m
118 +CONFIG_DM_MIRROR=m
119 +CONFIG_DM_RAID=m
120 +CONFIG_DM_LOG_USERSPACE=m
121 +CONFIG_DM_ZERO=m
122 +CONFIG_DM_DELAY=m
123  CONFIG_NETDEVICES=y
124 +CONFIG_BONDING=m
125  CONFIG_DUMMY=m
126 +CONFIG_MACVLAN=m
127  CONFIG_NETCONSOLE=m
128  CONFIG_TUN=m
129  CONFIG_MDIO_BITBANG=m
130  CONFIG_PPP=m
131  CONFIG_PPP_BSDCOMP=m
132  CONFIG_PPP_DEFLATE=m
133 +CONFIG_PPP_FILTER=y
134 +CONFIG_PPP_MPPE=m
135 +CONFIG_PPP_MULTILINK=y
136 +CONFIG_PPPOE=m
137 +CONFIG_PPPOL2TP=m
138  CONFIG_PPP_ASYNC=m
139  CONFIG_PPP_SYNC_TTY=m
140  CONFIG_SLIP=m
141  CONFIG_SLIP_COMPRESSED=y
142 +CONFIG_SLIP_SMART=y
143  CONFIG_USB_CATC=m
144  CONFIG_USB_KAWETH=m
145  CONFIG_USB_PEGASUS=m
146 @@ -397,6 +433,7 @@ CONFIG_USB_USBNET=y
147  CONFIG_USB_NET_AX8817X=m
148  CONFIG_USB_NET_CDCETHER=m
149  CONFIG_USB_NET_CDC_EEM=m
150 +CONFIG_USB_NET_CDC_NCM=m
151  CONFIG_USB_NET_CDC_MBIM=m
152  CONFIG_USB_NET_DM9601=m
153  CONFIG_USB_NET_SMSC75XX=m
154 @@ -473,14 +510,19 @@ CONFIG_INPUT_UINPUT=m
155  CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
156  CONFIG_INPUT_ADXL34X=m
157  CONFIG_INPUT_CMA3000=m
158 -# CONFIG_SERIO is not set
159 +CONFIG_SERIO=m
160 +CONFIG_SERIO_RAW=m
161 +CONFIG_GAMEPORT=m
162 +CONFIG_GAMEPORT_NS558=m
163 +CONFIG_GAMEPORT_L4=m
164  CONFIG_VT_HW_CONSOLE_BINDING=y
165  # CONFIG_LEGACY_PTYS is not set
166  # CONFIG_DEVKMEM is not set
167  CONFIG_SERIAL_AMBA_PL011=y
168  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
169 +CONFIG_TTY_PRINTK=y
170  CONFIG_HW_RANDOM=y
171 -CONFIG_HW_RANDOM_BCM2708=y
172 +CONFIG_HW_RANDOM_BCM2708=m
173  CONFIG_RAW_DRIVER=y
174  CONFIG_BRCM_CHAR_DRIVERS=y
175  CONFIG_BCM_VC_CMA=y
176 @@ -489,7 +531,7 @@ CONFIG_I2C_CHARDEV=m
177  CONFIG_I2C_BCM2708=m
178  CONFIG_SPI=y
179  CONFIG_SPI_BCM2708=m
180 -CONFIG_SPI_SPIDEV=m
181 +CONFIG_SPI_SPIDEV=y
182  CONFIG_GPIO_SYSFS=y
183  CONFIG_W1=m
184  CONFIG_W1_MASTER_DS2490=m
185 @@ -645,6 +687,7 @@ CONFIG_VIDEO_EM28XX_ALSA=m
186  CONFIG_VIDEO_EM28XX_DVB=m
187  CONFIG_RADIO_SI470X=y
188  CONFIG_USB_SI470X=m
189 +CONFIG_I2C_SI470X=m
190  CONFIG_USB_MR800=m
191  CONFIG_USB_DSBR=m
192  CONFIG_RADIO_SHARK=m
193 @@ -652,11 +695,14 @@ CONFIG_RADIO_SHARK2=m
194  CONFIG_RADIO_SI4713=m
195  CONFIG_USB_KEENE=m
196  CONFIG_USB_MA901=m
197 +CONFIG_RADIO_TEA5764=m
198  CONFIG_RADIO_SAA7706H=m
199  CONFIG_RADIO_TEF6862=m
200 +CONFIG_RADIO_WL1273=m
201  CONFIG_RADIO_WL128X=m
202  CONFIG_FB=y
203  CONFIG_FB_BCM2708=y
204 +# CONFIG_BACKLIGHT_GENERIC is not set
205  CONFIG_FRAMEBUFFER_CONSOLE=y
206  CONFIG_LOGO=y
207  # CONFIG_LOGO_LINUX_MONO is not set
208 @@ -679,6 +725,7 @@ CONFIG_SND_BCM2835=m
209  CONFIG_SND_USB_AUDIO=m
210  CONFIG_SND_USB_UA101=m
211  CONFIG_SND_USB_CAIAQ=m
212 +CONFIG_SND_USB_CAIAQ_INPUT=y
213  CONFIG_SND_USB_6FIRE=m
214  CONFIG_SOUND_PRIME=m
215  CONFIG_HIDRAW=y
216 @@ -829,6 +876,7 @@ CONFIG_MMC_SDHCI=y
217  CONFIG_MMC_SDHCI_PLTFM=y
218  CONFIG_MMC_SDHCI_BCM2708=y
219  CONFIG_MMC_SDHCI_BCM2708_DMA=y
220 +CONFIG_MMC_SPI=m
221  CONFIG_LEDS_GPIO=m
222  CONFIG_LEDS_TRIGGER_TIMER=y
223  CONFIG_LEDS_TRIGGER_ONESHOT=y
224 @@ -874,9 +922,20 @@ CONFIG_UIO=m
225  CONFIG_UIO_PDRV=m
226  CONFIG_UIO_PDRV_GENIRQ=m
227  CONFIG_STAGING=y
228 +CONFIG_W35UND=m
229 +CONFIG_PRISM2_USB=m
230 +CONFIG_R8712U=m
231 +CONFIG_VT6656=m
232 +CONFIG_SPEAKUP=m
233 +CONFIG_SPEAKUP_SYNTH_SOFT=m
234  CONFIG_STAGING_MEDIA=y
235 +CONFIG_DVB_AS102=m
236  CONFIG_LIRC_STAGING=y
237 +CONFIG_LIRC_IGORPLUGUSB=m
238 +CONFIG_LIRC_IMON=m
239  CONFIG_LIRC_RPI=m
240 +CONFIG_LIRC_SASEM=m
241 +CONFIG_LIRC_SERIAL=m
242  # CONFIG_IOMMU_SUPPORT is not set
243  CONFIG_EXT4_FS=y
244  CONFIG_EXT4_FS_POSIX_ACL=y
245 @@ -916,9 +975,13 @@ CONFIG_MSDOS_FS=y
246  CONFIG_VFAT_FS=y
247  CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
248  CONFIG_NTFS_FS=m
249 +CONFIG_NTFS_RW=y
250  CONFIG_TMPFS=y
251  CONFIG_TMPFS_POSIX_ACL=y
252  CONFIG_CONFIGFS_FS=y
253 +CONFIG_ECRYPT_FS=m
254 +CONFIG_HFS_FS=m
255 +CONFIG_HFSPLUS_FS=m
256  CONFIG_SQUASHFS=m
257  CONFIG_SQUASHFS_XATTR=y
258  CONFIG_SQUASHFS_LZO=y
259 @@ -936,7 +999,6 @@ CONFIG_CIFS=m
260  CONFIG_CIFS_WEAK_PW_HASH=y
261  CONFIG_CIFS_XATTR=y
262  CONFIG_CIFS_POSIX=y
263 -# CONFIG_CIFS_DEBUG is not set
264  CONFIG_9P_FS=m
265  CONFIG_9P_FS_POSIX_ACL=y
266  CONFIG_NLS_DEFAULT="utf8"
267 @@ -977,27 +1039,32 @@ CONFIG_NLS_ISO8859_14=m
268  CONFIG_NLS_ISO8859_15=m
269  CONFIG_NLS_KOI8_R=m
270  CONFIG_NLS_KOI8_U=m
271 -CONFIG_NLS_UTF8=m
272  CONFIG_DLM=m
273  CONFIG_PRINTK_TIME=y
274 +CONFIG_DEBUG_FS=y
275  CONFIG_DETECT_HUNG_TASK=y
276  CONFIG_TIMER_STATS=y
277 +# CONFIG_DEBUG_PREEMPT is not set
278  CONFIG_DEBUG_MEMORY_INIT=y
279  CONFIG_BOOT_PRINTK_DELAY=y
280  CONFIG_LATENCYTOP=y
281 +# CONFIG_KPROBE_EVENT is not set
282  CONFIG_KGDB=y
283  CONFIG_KGDB_KDB=y
284  CONFIG_KDB_KEYBOARD=y
285  CONFIG_STRICT_DEVMEM=y
286 +CONFIG_CRYPTO_USER=m
287 +CONFIG_CRYPTO_NULL=m
288 +CONFIG_CRYPTO_CRYPTD=m
289  CONFIG_CRYPTO_SEQIV=m
290  CONFIG_CRYPTO_CBC=y
291 -CONFIG_CRYPTO_HMAC=y
292 +CONFIG_CRYPTO_XTS=m
293  CONFIG_CRYPTO_XCBC=m
294 -CONFIG_CRYPTO_MD5=y
295 -CONFIG_CRYPTO_SHA1=y
296 +CONFIG_CRYPTO_SHA1_ARM=m
297  CONFIG_CRYPTO_SHA512=m
298  CONFIG_CRYPTO_TGR192=m
299  CONFIG_CRYPTO_WP512=m
300 +CONFIG_CRYPTO_AES_ARM=m
301  CONFIG_CRYPTO_CAST5=m
302  CONFIG_CRYPTO_DES=y
303  # CONFIG_CRYPTO_ANSI_CPRNG is not set