ARM64: configs: update rockchip_linux_defconfig by savedefconfig

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / configs / rockchip_linux_defconfig

diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
index 28fc2ea5d312671b999b743b595f0a98ecb9d74f..8d7fc1fd520e3f2677b1c193c34871291a483939 100644 (file)
--- a/arch/arm64/configs/rockchip_linux_defconfig
+++ b/arch/arm64/configs/rockchip_linux_defconfig
@@ -37,7 +37,6 @@ CONFIG_PCI_MSI=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEASPM_POWERSAVE=y
-CONFIG_BLK_DEV_NVME=y
 # CONFIG_ARM64_ERRATUM_826319 is not set
 # CONFIG_ARM64_ERRATUM_827319 is not set
 # CONFIG_ARM64_ERRATUM_824069 is not set
@@ -122,7 +121,6 @@ CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_IP_SET=y
 CONFIG_IP_VS=y
 CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_NAT_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
@@ -173,6 +171,7 @@ CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
+CONFIG_BLK_DEV_NVME=y
 CONFIG_ROCKCHIP_SCR=y
 CONFIG_SRAM=y
 CONFIG_SCSI=y
@@ -186,10 +185,12 @@ CONFIG_DM_THIN_PROVISIONING=y
 CONFIG_DM_VERITY=y
 CONFIG_NETDEVICES=y
 CONFIG_TUN=y
+CONFIG_VETH=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
 # CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_EMAC_ROCKCHIP=y
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
@@ -210,12 +211,10 @@ CONFIG_TUN=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
+CONFIG_STMMAC_ETH=y
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
-CONFIG_VETH=y
-CONFIG_EMAC_ROCKCHIP=y
-CONFIG_STMMAC_ETH=y
 CONFIG_PPP=y
 CONFIG_PPP_ASYNC=y
 CONFIG_USB_PEGASUS=y
@@ -268,7 +267,6 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 CONFIG_SERIO_RAW=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
@@ -360,7 +358,6 @@ CONFIG_MALI_DT=y
 CONFIG_MALI_DEVFREQ=y
 CONFIG_MALI_MIDGARD_FOR_LINUX=y
 CONFIG_MALI_MIDGARD=y
-CONFIG_MALI_DEVFREQ=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
@@ -424,9 +421,8 @@ CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_DWC3=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_DUAL_ROLE=y
 # CONFIG_USB_DWC3_PCI is not set
+CONFIG_USB_DWC2=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_CP210X=y
@@ -550,7 +546,6 @@ CONFIG_LKDTM=y
 CONFIG_TEST_UDELAY=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
-CONFIG_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_PATH=y