ARM updates for 4.18, cleanup some dropped config options

1 files changed, 4 insertions, 24 deletions

diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 21c1cae5e..d44ccdce7 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -251,7 +251,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARM_CCI_PMU is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASIX_PHY is not set
 CONFIG_ASUS_LAPTOP=m
@@ -994,7 +993,6 @@ CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_TEA=m
@@ -1218,10 +1216,6 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
-# CONFIG_DRM_EXYNOS_FIMC is not set
-# CONFIG_DRM_EXYNOS_GSC is not set
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
-# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
@@ -1292,7 +1286,6 @@ CONFIG_DRM_SII9234=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_V3D is not set
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
@@ -1628,7 +1621,7 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_FIXED_PHY=y
+CONFIG_FIXED_PHY=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2109,7 +2102,6 @@ CONFIG_IB700_WDT=m
 CONFIG_IBM_ASM=m
 CONFIG_IBMASR=m
 # CONFIG_IBM_RTL is not set
-# CONFIG_IBMVMC is not set
 CONFIG_ICE=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
@@ -2149,7 +2141,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@@ -2307,7 +2299,6 @@ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_AUDIT=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY=y
-# CONFIG_INTEL_ATOMISP is not set
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 CONFIG_INTEL_CHT_INT33FE=m
@@ -2401,7 +2392,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMI_PROC_INTERFACE is not set
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
@@ -2512,7 +2502,6 @@ CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
@@ -2917,7 +2906,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_LTC2632 is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
 CONFIG_LV0104CS=m
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_LWTUNNEL=y
@@ -3006,6 +2994,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_DEVICE=m
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3421,7 +3410,6 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 # CONFIG_NET5501 is not set
@@ -4102,15 +4090,12 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_DPC=y
-# CONFIG_PCIE_DW_HOST_ECAM is not set
 # CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_ECRC=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
@@ -4166,7 +4151,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=y
+CONFIG_PHYLIB=m
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
@@ -4328,10 +4313,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000 is not set
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCOM_APR is not set
-# CONFIG_QCOM_COMMAND_DB is not set
 # CONFIG_QCOM_EMAC is not set
-# CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GLINK_SSR is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -5551,7 +5533,6 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_ST_UVIS25_I2C=m
 CONFIG_ST_UVIS25=m
 CONFIG_ST_UVIS25_SPI=m
-# CONFIG_SUN50I_H6_R_CCU is not set
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
@@ -5935,7 +5916,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DWC3_HOST is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_QCOM is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y