Commit 51452e46647ed57ae83e6a95e1a4d700260e6bf0
Exists in
smarct4x-processor-sdk-linux-03.00.00.04
and in
2 other branches
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.4.y
TI-Feature: ti_linux_base_lsk TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-linux-4.4.y * 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: ARM: dts: keystone: increase number of descriptors in region-12 ti_config_fragments/connectivity.cfg: Enable IPSec config Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
Showing 3 changed files Side-by-side Diff
arch/arm/boot/dts/keystone-k2e-netcp.dtsi
arch/arm/boot/dts/keystone-k2hk-netcp.dtsi
ti_config_fragments/connectivity.cfg
... | ... | @@ -47,11 +47,19 @@ |
47 | 47 | CONFIG_NF_NAT_IPV4=m |
48 | 48 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
49 | 49 | CONFIG_BRIDGE=m |
50 | +CONFIG_XFRM_USER=m | |
51 | +CONFIG_NET_KEY=m | |
52 | +CONFIG_INET=y | |
53 | +CONFIG_INET_AH=m | |
50 | 54 | CONFIG_INET6_AH=m |
51 | 55 | CONFIG_INET6_IPCOMP=m |
52 | 56 | CONFIG_INET6_XFRM_TUNNEL=m |
53 | 57 | CONFIG_INET6_TUNNEL=m |
54 | 58 | CONFIG_INET_ESP=m |
59 | +CONFIG_INET_IPCOMP=m | |
60 | +CONFIG_INET_XFRM_MODE_TRANSPORT=m | |
61 | +CONFIG_INET_XFRM_MODE_TUNNEL=m | |
62 | +CONFIG_INET_XFRM_MODE_BEET=m | |
55 | 63 | CONFIG_IPV6_TUNNEL=m |
56 | 64 | CONFIG_NETFILTER=y |
57 | 65 | CONFIG_NETFILTER_XTABLES=m |
... | ... | @@ -67,6 +75,7 @@ |
67 | 75 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
68 | 76 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
69 | 77 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
78 | +CONFIG_NETFILTER_XT_MATCH_POLICY=m | |
70 | 79 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
71 | 80 | CONFIG_BRIDGE_NF_EBTABLES=m |
72 | 81 | CONFIG_BRIDGE_EBT_BROUTE=m |