Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fc611ff7a8e4238fd1157d1fcfc335512b9a20c7

Authored by Santosh Shilimkar
Committed by Mugunthan V N
1 parent ab05cccaed
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

ARM: config: omap: Make advanced networking features as modules 

Linux networking supports advanced networking features like IPSEC, NETFILTERS,
BRIDGING etc and should be enabled only when user has specific usecase to
use them. Thats why all typical distro's build them as modules so that all
the standard network usecases don't get any additional overhead and specific
case can load those modules when needed.

Lets align the config accordingly. Created using typical 'savedefconfig' method.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>

Showing 1 changed file with 30 additions and 53 deletions Side-by-side Diff

arch/arm/configs/omap2plus_defconfig
Diff comments   View file @ fc611ff
... ... @@ -23,25 +23,22 @@
23 23 CONFIG_ARCH_OMAP2PLUS=y
24 24 CONFIG_ARCH_MULTI_V6=y
25 25 CONFIG_GPIO_PCA953X=y
  26 +CONFIG_OMAP_RESET_CLOCKS=y
  27 +CONFIG_OMAP_MUX_DEBUG=y
26 28 CONFIG_ARCH_OMAP2=y
27 29 CONFIG_ARCH_OMAP3=y
28 30 CONFIG_ARCH_OMAP4=y
29 31 CONFIG_SOC_OMAP5=y
30   -CONFIG_SOC_AM33XX=y
31 32 CONFIG_SOC_AM43XX=y
32 33 CONFIG_SOC_DRA7XX=y
33   -CONFIG_OMAP_RESET_CLOCKS=y
34   -CONFIG_OMAP_MUX_DEBUG=y
35   -CONFIG_ARCH_VEXPRESS_CA9X4=y
36 34 CONFIG_OMAP4_ERRATA_I688=y
37 35 CONFIG_ARM_THUMBEE=y
38 36 CONFIG_ARM_ERRATA_411920=y
39 37 CONFIG_PCIE_DRA7XX=y
40 38 CONFIG_SMP=y
41 39 CONFIG_NR_CPUS=2
42   -CONFIG_CMA=y
43 40 CONFIG_PREEMPT=y
44   -CONFIG_LEDS=y
  41 +CONFIG_CMA=y
45 42 CONFIG_ZBOOT_ROM_TEXT=0x0
46 43 CONFIG_ZBOOT_ROM_BSS=0x0
47 44 CONFIG_ARM_APPENDED_DTB=y
48 45  
49 46  
... ... @@ -72,33 +69,20 @@
72 69 CONFIG_IP_PNP_DHCP=y
73 70 CONFIG_IP_PNP_BOOTP=y
74 71 CONFIG_IP_PNP_RARP=y
  72 +CONFIG_INET_XFRM_MODE_TRANSPORT=m
  73 +CONFIG_INET_XFRM_MODE_TUNNEL=m
  74 +CONFIG_INET_XFRM_MODE_BEET=m
75 75 # CONFIG_INET_LRO is not set
  76 +CONFIG_INET_DIAG=m
76 77 # CONFIG_IPV6 is not set
77 78 CONFIG_NETFILTER=y
78   -CONFIG_NETFILTER_ADVANCED=y
79   -CONFIG_NETFILTER_XTABLES=y
80   -CONFIG_NF_NAT=y
81   -CONFIG_NF_NAT_NEEDED=y
82   -CONFIG_NF_NAT_IPV4=y
83   -CONFIG_NF_DEFRAG_IPV4=y
84   -CONFIG_NF_CONNTRACK=y
85   -CONFIG_NF_CONNTRACK_IPV4=y
86   -CONFIG_NF_CONNTRACK_PROC_COMPAT=y
87   -CONFIG_IP_NF_IPTABLES=y
88   -CONFIG_IP_NF_FILTER=y
89   -CONFIG_IP_NF_TARGET_LOG=y
90   -CONFIG_IP_NF_TARGET_MASQUERADE=y
91   -CONFIG_BRIDGE=y
92   -CONFIG_BRIDGE_IGMP_SNOOPING=y
93   -CONFIG_BRIDGE_NETFILTER=y
94   -CONFIG_STP=y
95   -CONFIG_LLC=y
96   -CONFIG_INPUT_UINPUT=y
97   -CONFIG_HAS_IOMEM=y
98   -CONFIG_HAS_IOPORT=y
99   -CONFIG_HAS_DMA=y
100   -CONFIG_NLATTR=y
101   -CONFIG_AVERAGE=y
  79 +CONFIG_NF_CONNTRACK=m
  80 +CONFIG_NF_CONNTRACK_IPV4=m
  81 +CONFIG_IP_NF_IPTABLES=m
  82 +CONFIG_IP_NF_FILTER=m
  83 +CONFIG_NF_NAT_IPV4=m
  84 +CONFIG_IP_NF_TARGET_MASQUERADE=m
  85 +CONFIG_BRIDGE=m
102 86 CONFIG_VLAN_8021Q=y
103 87 CONFIG_CAN=m
104 88 CONFIG_CAN_C_CAN=m
105 89  
106 90  
... ... @@ -110,16 +94,13 @@
110 94 CONFIG_BT_HCIUART_LL=y
111 95 CONFIG_BT_HCIBCM203X=m
112 96 CONFIG_BT_HCIBPA10X=m
113   -CONFIG_NL80211_TESTMODE=y
  97 +CONFIG_BT_WILINK=m
114 98 CONFIG_CFG80211=m
  99 +CONFIG_NL80211_TESTMODE=y
115 100 CONFIG_MAC80211=m
116 101 CONFIG_MAC80211_RC_PID=y
117 102 CONFIG_MAC80211_RC_DEFAULT_PID=y
118   -CONFIG_WL_TI=y
119   -CONFIG_WL12XX=m
120   -CONFIG_WL18XX=m
121   -CONFIG_WLCORE=m
122   -CONFIG_WLCORE_SDIO=m
  103 +CONFIG_RFKILL=y
123 104 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
124 105 CONFIG_DEVTMPFS=y
125 106 CONFIG_DEVTMPFS_MOUNT=y
... ... @@ -171,6 +152,10 @@
171 152 CONFIG_LIBERTAS_USB=m
172 153 CONFIG_LIBERTAS_SDIO=m
173 154 CONFIG_LIBERTAS_DEBUG=y
  155 +CONFIG_WL_TI=y
  156 +CONFIG_WL12XX=m
  157 +CONFIG_WL18XX=m
  158 +CONFIG_WLCORE_SDIO=m
174 159 CONFIG_INPUT_JOYDEV=y
175 160 CONFIG_INPUT_EVDEV=y
176 161 CONFIG_KEYBOARD_GPIO=y
... ... @@ -183,6 +168,7 @@
183 168 CONFIG_TOUCHSCREEN_PIXCIR=m
184 169 CONFIG_INPUT_MISC=y
185 170 CONFIG_INPUT_TWL4030_PWRBUTTON=y
  171 +CONFIG_INPUT_UINPUT=y
186 172 # CONFIG_LEGACY_PTYS is not set
187 173 CONFIG_SERIAL_8250=y
188 174 CONFIG_SERIAL_8250_CONSOLE=y
... ... @@ -226,7 +212,6 @@
226 212 CONFIG_MFD_TPS65218=y
227 213 CONFIG_MFD_TPS65910=y
228 214 CONFIG_TWL6040_CORE=y
229   -CONFIG_REGULATOR_FIXED_VOLTAGE=y
230 215 CONFIG_REGULATOR_PALMAS=y
231 216 CONFIG_REGULATOR_PBIAS=y
232 217 CONFIG_REGULATOR_TPS65023=y
... ... @@ -240,6 +225,10 @@
240 225 CONFIG_MEDIA_CAMERA_SUPPORT=y
241 226 CONFIG_MEDIA_USB_SUPPORT=y
242 227 CONFIG_USB_VIDEO_CLASS=m
  228 +CONFIG_V4L_PLATFORM_DRIVERS=y
  229 +CONFIG_VIDEO_AM437X_VPFE=y
  230 +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  231 +CONFIG_VIDEO_OV2659=y
243 232 CONFIG_FB=y
244 233 CONFIG_FIRMWARE_EDID=y
245 234 CONFIG_FB_TILEBLITTING=y
... ... @@ -252,6 +241,7 @@
252 241 CONFIG_DISPLAY_ENCODER_TFP410=y
253 242 CONFIG_DISPLAY_ENCODER_TPD12S015=y
254 243 CONFIG_DISPLAY_DRA_EVM_ENCODER_TPD12S015=y
  244 +CONFIG_DISPLAY_ENCODER_SIL9022=y
255 245 CONFIG_DISPLAY_CONNECTOR_DVI=y
256 246 CONFIG_DISPLAY_CONNECTOR_HDMI=y
257 247 CONFIG_DISPLAY_PANEL_DPI=y
... ... @@ -276,6 +266,7 @@
276 266 CONFIG_SND_AM33XX_SOC_EVM=m
277 267 CONFIG_SND_AM43XX_SOC_EPOS_EVM=m
278 268 CONFIG_SND_OMAP_SOC=m
  269 +CONFIG_SND_OMAP_SOC_DRA7EVM=m
279 270 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
280 271 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
281 272 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
... ... @@ -287,7 +278,6 @@
287 278 CONFIG_USB_MUSB_HDRC=m
288 279 CONFIG_USB_MUSB_OMAP2PLUS=m
289 280 CONFIG_USB_MUSB_DSPS=m
290   -CONFIG_USB_MUSB_AM335X_CHILD=m
291 281 CONFIG_USB_TI_CPPI41_DMA=y
292 282 CONFIG_USB_WDM=y
293 283 CONFIG_USB_STORAGE=y
294 284  
295 285  
296 286  
... ... @@ -390,17 +380,11 @@
390 380 CONFIG_TIMER_STATS=y
391 381 CONFIG_PROVE_LOCKING=y
392 382 # CONFIG_DEBUG_BUGVERBOSE is not set
393   -CONFIG_RFKILL=y
394   -CONFIG_KEYS=y
395   -CONFIG_BT_WILINK=m
396   -CONFIG_WIRELESS_EXT=y
397 383 CONFIG_SECURITY=y
398   -CONFIG_CRYPTO=y
399   -CONFIG_CRYPTO_ARC4=y
400   -CONFIG_CRYPTO_ECB=y
401   -CONFIG_CRYPTO_AES=y
402 384 CONFIG_CRYPTO_TEST=m
  385 +CONFIG_CRYPTO_ECB=y
403 386 CONFIG_CRYPTO_MICHAEL_MIC=y
  387 +CONFIG_CRYPTO_ARC4=y
404 388 # CONFIG_CRYPTO_ANSI_CPRNG is not set
405 389 CONFIG_CRYPTO_USER_API_HASH=y
406 390 CONFIG_CRYPTO_USER_API_SKCIPHER=y
... ... @@ -415,11 +399,4 @@
415 399 CONFIG_FONTS=y
416 400 CONFIG_FONT_8x8=y
417 401 CONFIG_FONT_8x16=y
418   -CONFIG_SND_OMAP_SOC_DRA7EVM=y
419   -CONFIG_DISPLAY_ENCODER_SIL9022=y
420   -CONFIG_VIDEO_V4L2=y
421   -CONFIG_V4L_PLATFORM_DRIVERS=y
422   -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
423   -CONFIG_VIDEO_AM437X_VPFE=y
424   -CONFIG_VIDEO_OV2659=y