Browse code

aarch64: changes in config_aarch64

- enable USB PCI config so that Keyboard should work
- in 4.14.54 more configs has been added

Change-Id: I1b941f183929a21330cd3aafd50028da3853d533
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5478
Reviewed-by: Srinidhi Rao <srinidhir@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Ajay Kaher authored on 2018/08/11 04:57:50
Showing 2 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 #
2 2
 # Automatically generated file; DO NOT EDIT.
3
-# Linux/arm64 4.14.0 Kernel Configuration
3
+# Linux/arm64 4.14.54 Kernel Configuration
4 4
 #
5 5
 CONFIG_ARM64=y
6 6
 CONFIG_64BIT=y
... ...
@@ -514,6 +514,7 @@ CONFIG_ARM64_ERRATUM_819472=y
514 514
 CONFIG_ARM64_ERRATUM_832075=y
515 515
 CONFIG_ARM64_ERRATUM_845719=y
516 516
 CONFIG_ARM64_ERRATUM_843419=y
517
+CONFIG_ARM64_ERRATUM_1024718=y
517 518
 CONFIG_CAVIUM_ERRATUM_22375=y
518 519
 CONFIG_CAVIUM_ERRATUM_23144=y
519 520
 CONFIG_CAVIUM_ERRATUM_23154=y
... ...
@@ -522,6 +523,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
522 522
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
523 523
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
524 524
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
525
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
525 526
 CONFIG_ARM64_4K_PAGES=y
526 527
 # CONFIG_ARM64_16K_PAGES is not set
527 528
 # CONFIG_ARM64_64K_PAGES is not set
... ...
@@ -613,6 +615,8 @@ CONFIG_KEXEC=y
613 613
 CONFIG_XEN_DOM0=y
614 614
 CONFIG_XEN=y
615 615
 CONFIG_FORCE_MAX_ZONEORDER=11
616
+CONFIG_UNMAP_KERNEL_AT_EL0=y
617
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
616 618
 CONFIG_ARMV8_DEPRECATED=y
617 619
 CONFIG_SWP_EMULATION=y
618 620
 CONFIG_CP15_BARRIER_EMULATION=y
... ...
@@ -1136,6 +1140,9 @@ CONFIG_NF_CONNTRACK_IPV6=m
1136 1136
 # CONFIG_NF_SOCKET_IPV6 is not set
1137 1137
 CONFIG_NF_TABLES_IPV6=m
1138 1138
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
1139
+CONFIG_NFT_CHAIN_NAT_IPV6=m
1140
+CONFIG_NFT_MASQ_IPV6=m
1141
+CONFIG_NFT_REDIR_IPV6=m
1139 1142
 CONFIG_NFT_REJECT_IPV6=m
1140 1143
 CONFIG_NFT_DUP_IPV6=m
1141 1144
 # CONFIG_NFT_FIB_IPV6 is not set
... ...
@@ -1143,10 +1150,7 @@ CONFIG_NF_DUP_IPV6=m
1143 1143
 CONFIG_NF_REJECT_IPV6=m
1144 1144
 CONFIG_NF_LOG_IPV6=m
1145 1145
 CONFIG_NF_NAT_IPV6=m
1146
-CONFIG_NFT_CHAIN_NAT_IPV6=m
1147 1146
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
1148
-CONFIG_NFT_MASQ_IPV6=m
1149
-CONFIG_NFT_REDIR_IPV6=m
1150 1147
 CONFIG_IP6_NF_IPTABLES=m
1151 1148
 CONFIG_IP6_NF_MATCH_AH=m
1152 1149
 CONFIG_IP6_NF_MATCH_EUI64=m
... ...
@@ -4049,7 +4053,6 @@ CONFIG_HID_CHERRY=m
4049 4049
 # CONFIG_HID_CHICONY is not set
4050 4050
 # CONFIG_HID_PRODIKEYS is not set
4051 4051
 # CONFIG_HID_CMEDIA is not set
4052
-# CONFIG_HID_CP2112 is not set
4053 4052
 # CONFIG_HID_CYPRESS is not set
4054 4053
 # CONFIG_HID_DRAGONRISE is not set
4055 4054
 # CONFIG_HID_EMS_FF is not set
... ...
@@ -4133,7 +4136,7 @@ CONFIG_USB_SUPPORT=y
4133 4133
 CONFIG_USB_COMMON=m
4134 4134
 CONFIG_USB_ARCH_HAS_HCD=y
4135 4135
 CONFIG_USB=m
4136
-# CONFIG_USB_PCI is not set
4136
+CONFIG_USB_PCI=y
4137 4137
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
4138 4138
 
4139 4139
 #
... ...
@@ -4152,12 +4155,14 @@ CONFIG_USB_DEFAULT_PERSIST=y
4152 4152
 #
4153 4153
 # CONFIG_USB_C67X00_HCD is not set
4154 4154
 CONFIG_USB_XHCI_HCD=m
4155
+CONFIG_USB_XHCI_PCI=m
4155 4156
 # CONFIG_USB_XHCI_PLATFORM is not set
4156 4157
 # CONFIG_USB_XHCI_MTK is not set
4157 4158
 # CONFIG_USB_XHCI_MVEBU is not set
4158 4159
 CONFIG_USB_EHCI_HCD=m
4159 4160
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
4160 4161
 CONFIG_USB_EHCI_TT_NEWSCHED=y
4162
+CONFIG_USB_EHCI_PCI=m
4161 4163
 # CONFIG_USB_EHCI_HCD_ORION is not set
4162 4164
 # CONFIG_USB_EHCI_MSM is not set
4163 4165
 # CONFIG_USB_EHCI_TEGRA is not set
... ...
@@ -4169,9 +4174,11 @@ CONFIG_USB_EHCI_HCD_PLATFORM=m
4169 4169
 # CONFIG_USB_FOTG210_HCD is not set
4170 4170
 # CONFIG_USB_MAX3421_HCD is not set
4171 4171
 CONFIG_USB_OHCI_HCD=m
4172
+CONFIG_USB_OHCI_HCD_PCI=m
4172 4173
 CONFIG_USB_OHCI_HCD_SSB=y
4173 4174
 # CONFIG_USB_OHCI_EXYNOS is not set
4174 4175
 CONFIG_USB_OHCI_HCD_PLATFORM=m
4176
+CONFIG_USB_UHCI_HCD=m
4175 4177
 # CONFIG_USB_SL811_HCD is not set
4176 4178
 # CONFIG_USB_R8A66597_HCD is not set
4177 4179
 # CONFIG_USB_HCD_BCMA is not set
... ...
@@ -4226,6 +4233,7 @@ CONFIG_USB_DWC2=m
4226 4226
 #
4227 4227
 # CONFIG_USB_DWC2_PERIPHERAL is not set
4228 4228
 CONFIG_USB_DWC2_DUAL_ROLE=y
4229
+# CONFIG_USB_DWC2_PCI is not set
4229 4230
 # CONFIG_USB_DWC2_DEBUG is not set
4230 4231
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
4231 4232
 # CONFIG_USB_CHIPIDEA is not set
... ...
@@ -4347,7 +4355,11 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
4347 4347
 # CONFIG_USB_SNP_UDC_PLAT is not set
4348 4348
 # CONFIG_USB_M66592 is not set
4349 4349
 # CONFIG_USB_BDC_UDC is not set
4350
+# CONFIG_USB_AMD5536UDC is not set
4350 4351
 # CONFIG_USB_NET2272 is not set
4352
+# CONFIG_USB_NET2280 is not set
4353
+# CONFIG_USB_GOKU is not set
4354
+# CONFIG_USB_EG20T is not set
4351 4355
 # CONFIG_USB_GADGET_XILINX is not set
4352 4356
 # CONFIG_USB_DUMMY_HCD is not set
4353 4357
 # CONFIG_USB_CONFIGFS is not set
... ...
@@ -5482,9 +5494,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
5482 5482
 # CONFIG_PROFILE_ALL_BRANCHES is not set
5483 5483
 # CONFIG_STACK_TRACER is not set
5484 5484
 CONFIG_BLK_DEV_IO_TRACE=y
5485
-# CONFIG_KPROBE_EVENTS is not set
5486
-# CONFIG_UPROBE_EVENTS is not set
5487
-# CONFIG_PROBE_EVENTS is not set
5485
+CONFIG_KPROBE_EVENTS=y
5486
+CONFIG_UPROBE_EVENTS=y
5487
+CONFIG_PROBE_EVENTS=y
5488 5488
 # CONFIG_FTRACE_STARTUP_TEST is not set
5489 5489
 # CONFIG_TRACEPOINT_BENCHMARK is not set
5490 5490
 # CONFIG_RING_BUFFER_BENCHMARK is not set
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux
4 4
 Version:        4.14.54
5
-Release:        2%{?kat_build:.%kat_build}%{?dist}
5
+Release:        3%{?kat_build:.%kat_build}%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -341,6 +341,9 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
341 341
 %endif
342 342
 
343 343
 %changelog
344
+*   Fri Aug 17 2018 Ajay Kaher <akaher@vmware.com> 4.14.54-3
345
+-   Enabled USB PCI in config_aarch64
346
+-   Build hang (at make oldconfig) fix in config_aarch64
344 347
 *   Thu Jul 19 2018 Alexey Makhalov <amakhalov@vmware.com> 4.14.54-2
345 348
 -   .config: usb_serial_pl2303=m,wlan=y,can=m,gpio=y,pinctrl=y,iio=m
346 349
 *   Mon Jul 09 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.14.54-1