Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ac3434c4cf28958ad8c2964d191a104302dc0b16

Authored by LCPD Auto Merger
2 parents 9990994aaa 11f4e5bdaf
Exists in smarct4x-processor-sdk-linux-03.00.00.04 and in 2 other branches dlt-processor-sdk-linux-03.00.00.04, smarct3x-processor-sdk-linux-03.00.00.04

Merge branch 'integration-ti-linux-4.4.y' of git://git.ti.com/ti-linux-kernel/ke… 

…rnel-integration-tree into ti-linux-4.4.y

TI-Feature: integration
TI-Tree: git://git.ti.com/ti-linux-kernel/kernel-integration-tree.git
TI-Branch: integration-ti-linux-4.4.y

* 'integration-ti-linux-4.4.y' of git://git.ti.com/ti-linux-kernel/kernel-integration-tree:
  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
Diff comments   View file @ ac3434c
... ... @@ -93,7 +93,7 @@
93 93 ranges;
94 94 region-12 {
95 95 id = <12>;
96   - region-spec = <10240 128>; /* num_desc desc_size */
  96 + region-spec = <11264 128>; /* num_desc desc_size */
97 97 link-index = <0x4000>;
98 98 };
99 99 };
arch/arm/boot/dts/keystone-k2hk-netcp.dtsi
Diff comments   View file @ ac3434c
... ... @@ -106,7 +106,7 @@
106 106 ranges;
107 107 region-12 {
108 108 id = <12>;
109   - region-spec = <10240 128>; /* num_desc desc_size */
  109 + region-spec = <11264 128>; /* num_desc desc_size */
110 110 link-index = <0x4000>;
111 111 };
112 112 };
ti_config_fragments/connectivity.cfg
Diff comments   View file @ ac3434c
... ... @@ -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